Merge pull request #135 from WeiZhang555/fix-logger

log: init logrus always before use it
kata-containers · Feb 5, 2018 · 32142e7 · 32142e7
2 parents a371c5d + acdb463
commit 32142e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/agent.go b/agent.go
@@ -483,6 +483,10 @@ func main() {
 		},
 	}
 
+	if err = s.initLogger(); err != nil {
+		return
+	}
+
 	// Check if this agent has been run as the init process.
 	if os.Getpid() == 1 {
 		// pivot_root won't work, see
@@ -494,10 +498,6 @@ func main() {
 		}
 	}
 
-	if err = s.initLogger(); err != nil {
-		return
-	}
-
 	// Set agent as subreaper.
 	if err = s.setSubreaper(); err != nil {
 		return

diff --git a/reaper.go b/reaper.go
@@ -64,7 +64,7 @@ func (r *reaper) reap() error {
 		rus unix.Rusage
 	)
 
-	// When running new processes, libcontainer expects to wait
+	// When running new processes, agent expects to wait
 	// for the first process actually spawning the container.
 	// This lock allows any code starting a new process to take
 	// the lock prior to the start of this new process, preventing