Match-id-874f9137671e2f25234dd973d24aaf4775719f90

This commit is contained in:
BianTanggui
2022-07-04 15:24:41 +08:00
parent f1e31b5518
commit 5885984358

View File

@@ -16,11 +16,12 @@ import (
"strings"
"syscall"
"go.uber.org/zap"
"github.com/opencontainers/runtime-spec/specs-go"
"go.uber.org/zap"
"mindxcheckutils"
"huawei.com/npu-exporter/hwlog"
"mindxcheckutils"
)
const (
@@ -277,32 +278,32 @@ func main() {
}
}()
stopCh := make(chan struct{})
if err := initLogModule(stopCh); err != nil {
close(stopCh)
log.Fatal(err)
}
logPrefixWords, err := mindxcheckutils.GetLogPrefix()
if err != nil {
close(stopCh)
log.Fatal(err)
}
hwlog.RunLog.ZapLogger = hwlog.RunLog.ZapLogger.With(zap.String("user-info", logPrefixWords))
hwlog.OpLog.ZapLogger = hwlog.OpLog.ZapLogger.With(zap.String("user-info", logPrefixWords))
hwlog.RunLog.Infof("ascend docker runtime starting")
if !mindxcheckutils.StringChecker(strings.Join(os.Args, " "), 0,
maxCommandLength, mindxcheckutils.DefaultWhiteList+" ") {
close(stopCh)
log.Fatal("command error")
}
logWords := fmt.Sprintf("running %v", os.Args)
if len(logWords) > maxLogLength {
logWords = logWords[0:maxLogLength-1] + "..."
}
hwlog.OpLog.Infof(logWords)
if err := initLogModule(stopCh); err != nil {
close(stopCh)
log.Fatal(err)
}
logPrefixWords, err := mindxcheckutils.GetLogPrefix()
if err != nil {
close(stopCh)
log.Fatal(err)
}
hwlog.RunLog.ZapLogger = hwlog.RunLog.ZapLogger.With(zap.String("user-info", logPrefixWords))
hwlog.OpLog.ZapLogger = hwlog.OpLog.ZapLogger.With(zap.String("user-info", logPrefixWords))
hwlog.RunLog.Infof("ascend docker runtime starting")
if !mindxcheckutils.StringChecker(strings.Join(os.Args, " "), 0,
maxCommandLength, mindxcheckutils.DefaultWhiteList+" ") {
close(stopCh)
log.Fatal("command error")
}
logWords := fmt.Sprintf("running %v", os.Args)
if len(logWords) > maxLogLength {
logWords = logWords[0:maxLogLength-1] + "..."
}
hwlog.OpLog.Infof(logWords)
if err := doProcess(); err != nil {
hwlog.RunLog.Errorf("%v ascend docker runtime failed", logPrefixWords)
hwlog.OpLog.Errorf("%v failed", logWords)
close(stopCh)
hwlog.OpLog.Errorf("%v failed", logWords)
close(stopCh)
log.Fatal(err)
}
close(stopCh)