Merge pull request linkedin#152 from CVTJNII/DockerLogStdout

Log to stdout in the Docker container
lconnell · Mar 2, 2017 · f595168 · f595168
2 parents 6e01a77 + ff7f09b
commit f595168
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/config.go b/config.go
@@ -40,6 +40,7 @@ type BurrowConfig struct {
 		ClientID       string `gcfg:"client-id"`
 		GroupBlacklist string `gcfg:"group-blacklist"`
 		GroupWhitelist string `gcfg:"group-whitelist"`
+		StdoutLogfile  string `gcfg:"stdout-logfile"`
 	}
 	Zookeeper struct {
 		Hosts    []string `gcfg:"hostname"`

diff --git a/docker-config/logging.cfg b/docker-config/logging.cfg
@@ -1,6 +1,6 @@
 <seelog minlevel="info">
   <outputs formatid="main">
-    <rollingfile type="date" filename="/var/tmp/burrow/burrow.log" datepattern="2006-01-02" maxrolls="7" />
+    <console />
   </outputs>
   <formats>
     <format id="main" format="%Date(2006-01-02 15:04:05) [%LEVEL] %Msg%n"/>

diff --git a/main.go b/main.go
@@ -60,8 +60,10 @@ func burrowMain() int {
 	createPidFile(appContext.Config.General.LogDir + "/" + appContext.Config.General.PIDFile)
 	defer removePidFile(appContext.Config.General.LogDir + "/" + appContext.Config.General.PIDFile)
 
-	// Set up stderr/stdout to go to a separate log file
-	openOutLog(appContext.Config.General.LogDir + "/burrow.out")
+	// Set up stderr/stdout to go to a separate log file, if enabled
+	if appContext.Config.General.StdoutLogfile != "" {
+		openOutLog(appContext.Config.General.LogDir + "/" + appContext.Config.General.StdoutLogfile)
+	}
 	fmt.Println("Started Burrow at", time.Now().Format("January 2, 2006 at 3:04pm (MST)"))
 
 	// If a logging config is specified, replace the existing loggers