From f219ddcf4ef13b9d5de129da4eb2b56dbc899d61 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 21 Mar 2014 12:13:13 -0400
Subject: [PATCH] Add log config panel in admin
---
.gopmfile | 3 +--
modules/base/conf.go | 26 ++++++++++++++------------
routers/admin/admin.go | 3 +++
templates/admin/config.tmpl | 16 +++++++++++++++-
4 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/.gopmfile b/.gopmfile
index 9e2440f3e..5b690a06a 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -9,13 +9,12 @@ github.com/Unknwon/com=
github.com/Unknwon/cae=
github.com/Unknwon/goconfig=
github.com/dchest/scrypt=
-github.com/go-sql-driver/mysql=
-github.com/lib/pq=
github.com/lunny/xorm=
github.com/gogits/logs=
github.com/gogits/binding=
github.com/gogits/git=
github.com/gogits/gfm=
+github.com/gogits/cache=
[res]
include=templates|public|conf
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 2c3ecd72d..863daca64 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -43,6 +43,9 @@ var (
Cache cache.Cache
CacheAdapter string
CacheConfig string
+
+ LogMode string
+ LogConfig string
)
var Service struct {
@@ -83,15 +86,15 @@ func newService() {
func newLogService() {
// Get and check log mode.
- mode := Cfg.MustValue("log", "MODE", "console")
- modeSec := "log." + mode
+ LogMode = Cfg.MustValue("log", "MODE", "console")
+ modeSec := "log." + LogMode
if _, err := Cfg.GetSection(modeSec); err != nil {
- fmt.Printf("Unknown log mode: %s\n", mode)
+ fmt.Printf("Unknown log mode: %s\n", LogMode)
os.Exit(2)
}
// Log level.
- levelName := Cfg.MustValue("log."+mode, "LEVEL", "Trace")
+ levelName := Cfg.MustValue("log."+LogMode, "LEVEL", "Trace")
level, ok := logLevels[levelName]
if !ok {
fmt.Printf("Unknown log level: %s\n", levelName)
@@ -99,14 +102,13 @@ func newLogService() {
}
// Generate log configuration.
- var config string
- switch mode {
+ switch LogMode {
case "console":
- config = fmt.Sprintf(`{"level":%s}`, level)
+ LogConfig = fmt.Sprintf(`{"level":%s}`, level)
case "file":
logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log")
os.MkdirAll(path.Dir(logPath), os.ModePerm)
- config = fmt.Sprintf(
+ LogConfig = fmt.Sprintf(
`{"level":%s,"filename":%s,"rotate":%v,"maxlines":%d,"maxsize",%d,"daily":%v,"maxdays":%d}`, level,
logPath,
Cfg.MustBool(modeSec, "LOG_ROTATE", true),
@@ -115,13 +117,13 @@ func newLogService() {
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,
+ LogConfig = 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,
+ LogConfig = 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"),
@@ -129,8 +131,8 @@ func newLogService() {
Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
}
- log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), mode, config)
- log.Info("Log Mode: %s(%s)", strings.Title(mode), levelName)
+ log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), LogMode, LogConfig)
+ log.Info("Log Mode: %s(%s)", strings.Title(LogMode), levelName)
}
func newCacheService() {
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index d70af3c50..2e19b99c1 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -70,5 +70,8 @@ func Config(ctx *middleware.Context) {
ctx.Data["CacheAdapter"] = base.CacheAdapter
ctx.Data["CacheConfig"] = base.CacheConfig
+ ctx.Data["LogMode"] = base.LogMode
+ ctx.Data["LogConfig"] = base.LogConfig
+
ctx.HTML(200, "admin/config")
}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index ad32ec3fb..6906f2409 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -71,7 +71,21 @@
<div class="panel-body">
<div><b>Cache Adapter:</b> {{.CacheAdapter}}</div>
- <div><b>Cache Config:</b> <code>{{.CacheConfig}}</code></div>
+ <div><b>Cache Config:</b></div>
+ <div style="padding-top: 5px;"><pre>{{.CacheConfig}}</pre></div>
+ </div>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Log Configuration
+ </div>
+
+ <div class="panel-body">
+ <div><b>Log Mode:</b> {{.LogMode}}</div>
+ <div><b>Log Config:</b></div>
+ <div style="padding-top: 5px;"><pre>{{.LogConfig}}</pre></div>
+
</div>
</div>
</div>