Merge pull request #3338 from jwhonce/issue/3299

Add remote client log to file

3 files changed, 43 insertions, 5 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index cbca32cc8..847cc0731 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -104,9 +104,7 @@ func before(cmd *cobra.Command, args []string) error {
 		logrus.Errorf(err.Error())
 		os.Exit(1)
 	}
-	if err := setSyslog(); err != nil {
-		return err
-	}
+
 	if err := setupRootless(cmd, args); err != nil {
 		return err
 	}
@@ -121,6 +119,9 @@ func before(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	logrus.SetLevel(level)
+	if err := setSyslog(); err != nil {
+		return err
+	}
 
 	if err := setRLimits(); err != nil {
 		return err
diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go
index 1b9430e92..ecbb44d5a 100644
--- a/cmd/podman/main_remote.go
+++ b/cmd/podman/main_remote.go
@@ -3,8 +3,13 @@
 package main
 
 import (
+	"fmt"
+	"os"
 	"os/user"
+	"path/filepath"
 
+	"github.com/docker/docker/pkg/homedir"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -20,11 +25,41 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteUserName, "username", username, "username on the remote host")
 	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteHost, "remote-host", "", "remote host")
 	// TODO maybe we allow the altering of this for bridge connections?
-	//rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.VarlinkAddress, "varlink-address", adapter.DefaultAddress, "address of the varlink socket")
-	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error, fatal or panic")
+	// rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.VarlinkAddress, "varlink-address", adapter.DefaultAddress, "address of the varlink socket")
+	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error, fatal or panic. Logged to ~/.config/containers/podman.log")
+	rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Syslog, "syslog", false, "Output logging information to syslog as well as the console")
 }
 
 func setSyslog() error {
+	// Log to file if not using syslog
+	homeDir := homedir.Get()
+	path := filepath.Join(homeDir, ".config", "containers")
+
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		if err := os.MkdirAll(path, 0750); err != nil {
+			fmt.Fprintf(os.Stderr, "%v", err)
+			return err
+		}
+	}
+
+	// Update path to include file name
+	path = filepath.Join(path, "podman.log")
+
+	// Create the log file if doesn't exist. And append to it if it already exists.
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0640)
+	if err != nil {
+		// Cannot open log file. Logging to stderr
+		fmt.Fprintf(os.Stderr, "%v", err)
+		return err
+	} else {
+		formatter := new(logrus.TextFormatter)
+		formatter.FullTimestamp = true
+		logrus.SetFormatter(formatter)
+		logrus.SetOutput(file)
+	}
+
+	// Note this message is only logged if --log-level >= Info!
+	logrus.Infof("Logging level set to %s", logrus.GetLevel().String())
 	return nil
 }
 
diff --git a/docs/podman.1.md b/docs/podman.1.md
index e1dc1d1f1..c23075718 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -90,6 +90,8 @@ Storage driver option, Default storage driver options are configured in /etc/con
 
 output logging information to syslog as well as the console
 
+On remote clients, logging is directed to the file ~/.config/containers/podman.log
+
 **--version**, **-v**
 
 Print the version