Merge pull request #118 from changweige/nydusd-log

enhance how nydusd's log are logged and redirected
containerd · Aug 2, 2022 · c360523 · c360523
2 parents e3b70b1 + d3252b6
commit c360523
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/misc/snapshotter/nydus-snapshotter.fscache.service b/misc/snapshotter/nydus-snapshotter.fscache.service
@@ -11,6 +11,8 @@ Restart=always
 RestartSec=1
 KillMode=process
 OOMScoreAdjust=-999
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/misc/snapshotter/nydus-snapshotter.fusedev.service b/misc/snapshotter/nydus-snapshotter.fusedev.service
@@ -11,6 +11,8 @@ Restart=always
 RestartSec=1
 KillMode=process
 OOMScoreAdjust=-999
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pkg/process/manager.go b/pkg/process/manager.go
@@ -184,10 +184,11 @@ func (m *Manager) buildStartCommand(d *daemon.Daemon) (*exec.Cmd, error) {
 	log.L.Infof("start nydus daemon: %s %s", m.nydusdBinaryPath, strings.Join(args, " "))
 
 	cmd := exec.Command(m.nydusdBinaryPath, args...)
-	if d.LogToStdout {
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stdout
-	}
+	// nydusd standard output and standard error rather than its logs are
+	// always redirected to snapshotter's respectively
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
 	return cmd, nil
 }