+ config: Added in lumberjack to handle rolling logs. Added more config properties around new log feature.

Reset logger max file size config. Fix #1573.

Remove verbose from default config.

home/config.go

@@ -24,8 +24,13 @@ const (
 
 // logSettings
 type logSettings struct {
-	LogFile string `yaml:"log_file"` // Path to the log file. If empty, write to stdout. If "syslog", writes to syslog
-	Verbose bool   `yaml:"verbose"`  // If true, verbose logging is enabled
+	LogCompress   bool   `yaml:"log_compress"`    // Compress determines if the rotated log files should be compressed using gzip (default: false)
+	LogLocalTime  bool   `yaml:"log_localtime"`   // If the time used for formatting the timestamps in is the computer's local time (default: false [UTC])
+	LogMaxBackups int    `yaml:"log_max_backups"` // Maximum number of old log files to retain (MaxAge may still cause them to get deleted)
+	LogMaxSize    int    `yaml:"log_max_size"`    // Maximum size in megabytes of the log file before it gets rotated (default 100 MB)
+	LogMaxAge     int    `yaml:"log_max_age"`     // MaxAge is the maximum number of days to retain old log files
+	LogFile       string `yaml:"log_file"`        // Path to the log file. If empty, write to stdout. If "syslog", writes to syslog
+	Verbose       bool   `yaml:"verbose"`         // If true, verbose logging is enabled
 }
 
 // configuration is loaded from YAML
@@ -131,6 +136,13 @@ var config = configuration{
 		LeaseDuration: 86400,
 		ICMPTimeout:   1000,
 	},
+	logSettings: logSettings{
+		LogCompress:   false,
+		LogLocalTime:  false,
+		LogMaxBackups: 0,
+		LogMaxSize:    100,
+		LogMaxAge:     0,
+	},
 	SchemaVersion: currentSchemaVersion,
 }
 

home/home.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"gopkg.in/natefinch/lumberjack.v2"
 	"io"
 	"io/ioutil"
 	"net"
@@ -396,13 +397,22 @@ func configureLogger(args options) {
 	ls := getLogSettings()
 
 	// command-line arguments can override config settings
-	if args.verbose {
+	if args.verbose || config.Verbose {
 		ls.Verbose = true
 	}
 	if args.logFile != "" {
 		ls.LogFile = args.logFile
+	} else if config.LogFile != "" {
+		ls.LogFile = config.LogFile
 	}
 
+	// Handle default log settings overrides
+	ls.LogCompress = config.LogCompress
+	ls.LogLocalTime = config.LogLocalTime
+	ls.LogMaxBackups = config.LogMaxBackups
+	ls.LogMaxSize = config.LogMaxSize
+	ls.LogMaxAge = config.LogMaxAge
+
 	// log.SetLevel(log.INFO) - default
 	if ls.Verbose {
 		log.SetLevel(log.DEBUG)
@@ -414,6 +424,7 @@ func configureLogger(args options) {
 		ls.LogFile = configSyslog
 	}
 
+	// logs are written to stdout (default)
 	if ls.LogFile == "" {
 		return
 	}
@@ -430,11 +441,19 @@ func configureLogger(args options) {
 			logFilePath = ls.LogFile
 		}
 
-		file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+		_, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
 		if err != nil {
 			log.Fatalf("cannot create a log file: %s", err)
 		}
-		log.SetOutput(file)
+
+		log.SetOutput(&lumberjack.Logger{
+			Filename:   logFilePath,
+			Compress:   ls.LogCompress, // disabled by default
+			LocalTime:  ls.LogLocalTime,
+			MaxBackups: ls.LogMaxBackups,
+			MaxSize:    ls.LogMaxSize, // megabytes
+			MaxAge:     ls.LogMaxAge,  //days
+		})
 	}
 }