Merge branch 'master' of github.com:gogits/gogs

conf/app.ini

@@ -2,7 +2,7 @@
 APP_NAME = Gogs: Go Git Service
 ; !!MUST CHANGE TO YOUR USER NAME!!
 RUN_USER = lunny
-; Either "dev", "prod" or "test", based on martini
+; Either "dev", "prod" or "test", default is "dev"
 RUN_MODE = dev
 
 [repository]
@@ -32,9 +32,61 @@ USER_PASSWD_SALT = !#@FDEWREWR&*(
 [mailer]
 ENABLED = false
 ; Name displayed in mail title
-NAME = %(APP_NAME)s
+SUBJECT = %(APP_NAME)s
 ; Mail server
 HOST = 
 ; Mailer user name and password
 USER = 
 PASSWD = 
+
+[log]
+; Either "console", "file", "conn" or "smtp", default is "console"
+MODE = console
+; Buffer length of channel, keep it as it is if you don't know what it is.
+BUFFER_LEN = 10000
+; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
+LEVEL = Trace
+
+; For "console" mode only
+[log.console]
+LEVEL = 
+
+; For "file" mode only
+[log.file]
+LEVEL = 
+FILE_NAME = log/gogs.log
+; This enables automated log rotate(switch of following options), default is true
+LOG_ROTATE = true
+; Max line number of single file, default is 1000000
+MAX_LINES = 1000000
+; Max size shift of single file, default is 28 means 1 << 28, 256MB
+MAX_SIZE_SHIFT = 28
+; Segment log daily, default is true
+DAILY_ROTATE = true
+; Expired days of log file(delete after max days), default is 7
+MAX_DAYS = 7
+
+; For "conn" mode only
+[log.conn]
+LEVEL = 
+; Reconnect host for every single message, default is false
+RECONNECT_ON_MSG = false
+; Try to reconnect when connection is lost, default is false
+RECONNECT = false
+; Either "tcp", "unix" or "udp", default is "tcp"
+PROTOCOL = tcp
+; Host address
+ADDR = 
+
+; For "smtp" mode only
+[log.smtp]
+LEVEL = 
+; Name displayed in mail title, default is "Diagnostic message from serve"
+SUBJECT = Diagnostic message from serve
+; Mail server
+HOST = 
+; Mailer user name and password
+USER = 
+PASSWD =
+; Receivers, can be one or more, e.g. ["1@example.com","2@example.com"]
+RECEIVERS = 

gogs.go

@@ -20,7 +20,7 @@ import (
 // Test that go1.1 tag above is included in builds. main.go refers to this definition.
 const go11tag = true
 
-const APP_VER = "0.1.0.0318.1"
+const APP_VER = "0.1.0.0319.1"
 
 func init() {
 	base.AppVer = APP_VER

modules/base/conf.go

@@ -44,6 +44,76 @@ func exeDir() (string, error) {
 	return path.Dir(p), nil
 }
 
+var logLevels = map[string]string{
+	"Trace":    "0",
+	"Debug":    "1",
+	"Info":     "2",
+	"Warn":     "3",
+	"Error":    "4",
+	"Critical": "5",
+}
+
+func newLogService() {
+	// Get and check log mode.
+	mode := Cfg.MustValue("log", "MODE", "console")
+	modeSec := "log." + mode
+	if _, err := Cfg.GetSection(modeSec); err != nil {
+		fmt.Printf("Unknown log mode: %s\n", mode)
+		os.Exit(2)
+	}
+
+	// Log level.
+	level, ok := logLevels[Cfg.MustValue("log."+mode, "LEVEL", "Trace")]
+	if !ok {
+		fmt.Printf("Unknown log level: %s\n", Cfg.MustValue("log."+mode, "LEVEL", "Trace"))
+		os.Exit(2)
+	}
+
+	// Generate log configuration.
+	var config string
+	switch mode {
+	case "console":
+		config = fmt.Sprintf(`{"level":%s}`, level)
+	case "file":
+		config = fmt.Sprintf(
+			`{"level":%s,"filename":%s,"rotate":%v,"maxlines":%d,"maxsize",%d,"daily":%v,"maxdays":%d}`, level,
+			Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log"),
+			Cfg.MustBool(modeSec, "LOG_ROTATE", true),
+			Cfg.MustInt(modeSec, "MAX_LINES", 1000000),
+			1<<uint(Cfg.MustInt(modeSec, "MAX_SIZE_SHIFT", 28)),
+			Cfg.MustBool(modeSec, "DAILY_ROTATE", true),
+			Cfg.MustInt(modeSec, "MAX_DAYS", 7))
+	case "conn":
+		config = fmt.Sprintf(`{"level":%s,"reconnectOnMsg":%v,"reconnect":%v,"net":%s,"addr":%s}`, level,
+			Cfg.MustBool(modeSec, "RECONNECT_ON_MSG", false),
+			Cfg.MustBool(modeSec, "RECONNECT", false),
+			Cfg.MustValue(modeSec, "PROTOCOL", "tcp"),
+			Cfg.MustValue(modeSec, "ADDR", ":7020"))
+	case "smtp":
+		config = fmt.Sprintf(`{"level":%s,"username":%s,"password":%s,"host":%s,"sendTos":%s,"subject":%s}`, level,
+			Cfg.MustValue(modeSec, "USER", "example@example.com"),
+			Cfg.MustValue(modeSec, "PASSWD", "******"),
+			Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
+			Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
+			Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
+	}
+
+	log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), mode, config)
+}
+
+func newMailService() {
+	// Check mailer setting.
+	if Cfg.MustBool("mailer", "ENABLED") {
+		MailService = &Mailer{
+			Name:   Cfg.MustValue("mailer", "NAME", AppName),
+			Host:   Cfg.MustValue("mailer", "HOST", "127.0.0.1:25"),
+			User:   Cfg.MustValue("mailer", "USER", "example@example.com"),
+			Passwd: Cfg.MustValue("mailer", "PASSWD", "******"),
+		}
+		log.Info("Mail Service Enabled")
+	}
+}
+
 func init() {
 	var err error
 	workDir, err := exeDir()
@@ -72,14 +142,7 @@ func init() {
 	AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service")
 	Domain = Cfg.MustValue("server", "DOMAIN")
 
-	// Check mailer setting.
-	if Cfg.MustBool("mailer", "ENABLED") {
-		MailService = &Mailer{
-			Name:   Cfg.MustValue("mailer", "NAME", AppName),
-			Host:   Cfg.MustValue("mailer", "HOST", "127.0.0.1:25"),
-			User:   Cfg.MustValue("mailer", "USER", "example@example.com"),
-			Passwd: Cfg.MustValue("mailer", "PASSWD", "******"),
-		}
-		log.Info("Mail Service Enabled")
-	}
+	// Extensions.
+	newLogService()
+	newMailService()
 }

modules/log/log.go

@@ -11,9 +11,9 @@ import (
 
 var logger *logs.BeeLogger
 
-func init() {
-	logger = logs.NewLogger(10000)
-	logger.SetLogger("console", "")
+func NewLogger(bufLen int64, mode, config string) {
+	logger = logs.NewLogger(bufLen)
+	logger.SetLogger(mode, config)
 }
 
 func Trace(format string, v ...interface{}) {