Merge pull request #3094 from apostasie/dev-3092

Restore logger output
containerd · Jun 16, 2024 · 60cf112 · 60cf112
2 parents ba876fb + f4a7e0c
commit 60cf112
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/ocihook/ocihook.go b/pkg/ocihook/ocihook.go
@@ -80,8 +80,15 @@ func Run(stdin io.Reader, stderr io.Writer, event, dataStore, cniPath, cniNetcon
 	if err != nil {
 		return err
 	}
-	defer logFile.Close()
+	currentOutput := log.L.Logger.Out
 	log.L.Logger.SetOutput(io.MultiWriter(stderr, logFile))
+	defer func() {
+		log.L.Logger.SetOutput(currentOutput)
+		err = logFile.Close()
+		if err != nil {
+			log.L.Logger.WithError(err).Error("failed closing oci hook log file")
+		}
+	}()
 
 	opts, err := newHandlerOpts(&state, dataStore, cniPath, cniNetconfPath)
 	if err != nil {