fix: set procutils execution LANG env

This commit is contained in:
Qiu Jian
2022-05-12 18:45:59 +08:00
parent e238f31df4
commit 5a022246be
2 changed files with 48 additions and 0 deletions
+44
View File
@@ -0,0 +1,44 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build !windows
package procutils
import (
"os"
"os/exec"
"yunion.io/x/executor/client"
)
var (
presetEnv = []string{
"LANG=en_US.UTF8",
}
)
func cmdSetEnv(cmd *exec.Cmd) {
cmd.Env = append(
os.Environ(),
presetEnv...,
)
}
func remoteCmdSetEnv(cmd *client.Cmd) {
cmd.Env = append(
os.Environ(),
presetEnv...,
)
}
+4
View File
@@ -68,12 +68,14 @@ type defaultExecutor struct{}
func (e *defaultExecutor) Command(name string, args ...string) Cmd {
cmd := exec.Command(name, args...)
cmdSetSid(cmd)
cmdSetEnv(cmd)
return &defaultCmd{cmd}
}
func (e *defaultExecutor) CommandContext(ctx context.Context, name string, args ...string) Cmd {
cmd := exec.CommandContext(ctx, name, args...)
cmdSetSid(cmd)
cmdSetEnv(cmd)
return &defaultCmd{cmd}
}
@@ -90,11 +92,13 @@ type remoteExecutor struct{}
func (e *remoteExecutor) Command(name string, args ...string) Cmd {
cmd := client.Command(name, args...)
remoteCmdSetEnv(cmd)
return cmd
}
func (e *remoteExecutor) CommandContext(ctx context.Context, name string, args ...string) Cmd {
cmd := client.CommandContext(ctx, name, args...)
remoteCmdSetEnv(cmd)
return cmd
}