Match-id-53156e597239e5b05b84675c76687c15e29120eb

runtime/main.go

@@ -16,6 +16,7 @@ import (
 	"strings"
 	"syscall"
 
+    "go.uber.org/zap"
 	"github.com/opencontainers/runtime-spec/specs-go"
 
 	"huawei.com/npu-exporter/hwlog"
@@ -82,6 +83,7 @@ func initLogModule(stopCh <-chan struct{}) error {
 		LogLevel:    0,
 		MaxBackups:  backups,
 		MaxAge:      logMaxAge,
+		OnlyToFile:  true,
 	}
 	if err := hwlog.InitOperateLogger(&operateLogConfig, stopCh); err != nil {
 		fmt.Printf("hwlog init failed, error is %v", err)
@@ -153,6 +155,7 @@ func addHook(spec *specs.Spec) error {
 	}
 
 	vdevice, err := dcmi.CreateVDevice(&dcmi.NpuWorker{}, spec)
+	hwlog.RunLog.Infof("vnpu split done: vdevice: %v err: %v", vdevice.VdeviceID, err)
 	if err != nil {
 		return err
 	}
@@ -273,7 +276,34 @@ func main() {
 			log.Fatal(err)
 		}
 	}()
+	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 := doProcess(); err != nil {
+		hwlog.RunLog.Errorf("%v ascend docker runtime failed", logPrefixWords)
+        hwlog.OpLog.Errorf("%v failed", logWords)
+        close(stopCh)
 		log.Fatal(err)
 	}
+	close(stopCh)
 }