Move xorm logger bridge from log to models so that log module could be a standalone...

* move xorm logger bridge from log to models so that log module could be a standalone package

* fix tests

* save logger on xorm log bridge

diff --git a/models/log.go b/models/log.go
new file mode 100644 (file)
index 0000000..4994545
--- /dev/null
+++ b/models/log.go
@@ -0,0 +1,106 @@
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package models
+
+import (
+       "fmt"
+
+       "code.gitea.io/gitea/modules/log"
+
+       "github.com/go-xorm/core"
+)
+
+// XORMLogBridge a logger bridge from Logger to xorm
+type XORMLogBridge struct {
+       showSQL bool
+       level   core.LogLevel
+       logger  *log.Logger
+}
+
+// NewXORMLogger inits a log bridge for xorm
+func NewXORMLogger(showSQL bool) core.ILogger {
+       return &XORMLogBridge{
+               showSQL: showSQL,
+               logger:  log.GetLogger("xorm"),
+       }
+}
+
+// Log a message with defined skip and at logging level
+func (l *XORMLogBridge) Log(skip int, level log.Level, format string, v ...interface{}) error {
+       return l.logger.Log(skip+1, level, format, v...)
+}
+
+// Debug show debug log
+func (l *XORMLogBridge) Debug(v ...interface{}) {
+       l.Log(2, log.DEBUG, fmt.Sprint(v...))
+}
+
+// Debugf show debug log
+func (l *XORMLogBridge) Debugf(format string, v ...interface{}) {
+       l.Log(2, log.DEBUG, format, v...)
+}
+
+// Error show error log
+func (l *XORMLogBridge) Error(v ...interface{}) {
+       l.Log(2, log.ERROR, fmt.Sprint(v...))
+}
+
+// Errorf show error log
+func (l *XORMLogBridge) Errorf(format string, v ...interface{}) {
+       l.Log(2, log.ERROR, format, v...)
+}
+
+// Info show information level log
+func (l *XORMLogBridge) Info(v ...interface{}) {
+       l.Log(2, log.INFO, fmt.Sprint(v...))
+}
+
+// Infof show information level log
+func (l *XORMLogBridge) Infof(format string, v ...interface{}) {
+       l.Log(2, log.INFO, format, v...)
+}
+
+// Warn show warning log
+func (l *XORMLogBridge) Warn(v ...interface{}) {
+       l.Log(2, log.WARN, fmt.Sprint(v...))
+}
+
+// Warnf show warnning log
+func (l *XORMLogBridge) Warnf(format string, v ...interface{}) {
+       l.Log(2, log.WARN, format, v...)
+}
+
+// Level get logger level
+func (l *XORMLogBridge) Level() core.LogLevel {
+       switch l.logger.GetLevel() {
+       case log.TRACE, log.DEBUG:
+               return core.LOG_DEBUG
+       case log.INFO:
+               return core.LOG_INFO
+       case log.WARN:
+               return core.LOG_WARNING
+       case log.ERROR, log.CRITICAL:
+               return core.LOG_ERR
+       }
+       return core.LOG_OFF
+}
+
+// SetLevel set the logger level
+func (l *XORMLogBridge) SetLevel(lvl core.LogLevel) {
+}
+
+// ShowSQL set if record SQL
+func (l *XORMLogBridge) ShowSQL(show ...bool) {
+       if len(show) > 0 {
+               l.showSQL = show[0]
+       } else {
+               l.showSQL = true
+       }
+}
+
+// IsShowSQL if record SQL
+func (l *XORMLogBridge) IsShowSQL() bool {
+       return l.showSQL
+}

diff --git a/models/models.go b/models/models.go
index 352c07e0c3f033025b837a004152aaf74372a4c3..c7e58737ede8323dddfb89431bcd1244b70525e8 100644 (file)
--- a/models/models.go
+++ b/models/models.go
@@ -15,7 +15,6 @@ import (
        "path/filepath"
        "strings"
 
-       "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
 
        // Needed for the MySQL driver
@@ -261,7 +260,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
        }
 
        x.SetMapper(core.GonicMapper{})
-       x.SetLogger(log.XORMLogger)
+       x.SetLogger(NewXORMLogger(!setting.ProdMode))
        x.ShowSQL(!setting.ProdMode)
        return x.StoreEngine("InnoDB").Sync2(tables...)
 }
@@ -276,7 +275,7 @@ func SetEngine() (err error) {
        x.SetMapper(core.GonicMapper{})
        // WARNING: for serv command, MUST remove the output to os.stdout,
        // so use log file to instead print to stdout.
-       x.SetLogger(log.XORMLogger)
+       x.SetLogger(NewXORMLogger(setting.LogSQL))
        x.ShowSQL(setting.LogSQL)
        return nil
 }

diff --git a/modules/log/xorm.go b/modules/log/xorm.go
deleted file mode 100644 (file)
index c08b7fd..0000000
--- a/modules/log/xorm.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package log
-
-import (
-       "fmt"
-
-       "github.com/go-xorm/core"
-)
-
-// XORMLogBridge a logger bridge from Logger to xorm
-type XORMLogBridge struct {
-       showSQL bool
-       level   core.LogLevel
-}
-
-var (
-       // XORMLogger the logger for xorm
-       XORMLogger *XORMLogBridge
-)
-
-// InitXORMLogger inits a log bridge for xorm
-func InitXORMLogger(showSQL bool) {
-       XORMLogger = &XORMLogBridge{
-               showSQL: showSQL,
-       }
-}
-
-// GetGiteaLevel returns the minimum Gitea logger level
-func (l *XORMLogBridge) GetGiteaLevel() Level {
-       return GetLogger("xorm").GetLevel()
-}
-
-// Log a message with defined skip and at logging level
-func (l *XORMLogBridge) Log(skip int, level Level, format string, v ...interface{}) error {
-       return GetLogger("xorm").Log(skip+1, level, format, v...)
-}
-
-// Debug show debug log
-func (l *XORMLogBridge) Debug(v ...interface{}) {
-       l.Log(2, DEBUG, fmt.Sprint(v...))
-}
-
-// Debugf show debug log
-func (l *XORMLogBridge) Debugf(format string, v ...interface{}) {
-       l.Log(2, DEBUG, format, v...)
-}
-
-// Error show error log
-func (l *XORMLogBridge) Error(v ...interface{}) {
-       l.Log(2, ERROR, fmt.Sprint(v...))
-}
-
-// Errorf show error log
-func (l *XORMLogBridge) Errorf(format string, v ...interface{}) {
-       l.Log(2, ERROR, format, v...)
-}
-
-// Info show information level log
-func (l *XORMLogBridge) Info(v ...interface{}) {
-       l.Log(2, INFO, fmt.Sprint(v...))
-}
-
-// Infof show information level log
-func (l *XORMLogBridge) Infof(format string, v ...interface{}) {
-       l.Log(2, INFO, format, v...)
-}
-
-// Warn show warning log
-func (l *XORMLogBridge) Warn(v ...interface{}) {
-       l.Log(2, WARN, fmt.Sprint(v...))
-}
-
-// Warnf show warnning log
-func (l *XORMLogBridge) Warnf(format string, v ...interface{}) {
-       l.Log(2, WARN, format, v...)
-}
-
-// Level get logger level
-func (l *XORMLogBridge) Level() core.LogLevel {
-       switch l.GetGiteaLevel() {
-       case TRACE, DEBUG:
-               return core.LOG_DEBUG
-       case INFO:
-               return core.LOG_INFO
-       case WARN:
-               return core.LOG_WARNING
-       case ERROR, CRITICAL:
-               return core.LOG_ERR
-       }
-       return core.LOG_OFF
-}
-
-// SetLevel set the logger level
-func (l *XORMLogBridge) SetLevel(lvl core.LogLevel) {
-}
-
-// ShowSQL set if record SQL
-func (l *XORMLogBridge) ShowSQL(show ...bool) {
-       if len(show) > 0 {
-               l.showSQL = show[0]
-       } else {
-               l.showSQL = true
-       }
-}
-
-// IsShowSQL if record SQL
-func (l *XORMLogBridge) IsShowSQL() bool {
-       return l.showSQL
-}

diff --git a/modules/setting/log.go b/modules/setting/log.go
index cd2c5cc8c163eef2f2797b5a692b1691a3af3eeb..43a28309d26ddb511e4d74fbecbb5e721a27cfb7 100644 (file)
--- a/modules/setting/log.go
+++ b/modules/setting/log.go
@@ -295,8 +295,5 @@ func NewXORMLogService(disableConsole bool) {
 
                Cfg.Section("log").Key("XORM").MustString(",")
                generateNamedLogger("xorm", options)
-               log.InitXORMLogger(LogSQL)
-       } else {
-               log.InitXORMLogger(false)
        }
 }