MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 20:54:52 +01:00
Code Issues Releases Wiki Activity

fix panic when push but the only log mode console is disabled by serv and update commands (#1007)

Browse source
This commit is contained in:
Lunny Xiao 2017-02-22 19:44:51 +08:00 committed by GitHub
parent 01d957677f
commit d6748284bd
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/log/xorm.go
View file

@ -22,6 +22,13 @@ var (
XORMLogger *XORMLogBridge XORMLogger *XORMLogBridge
) )
// DiscardXORMLogger inits a blank logger for xorm
func DiscardXORMLogger() {
XORMLogger = &XORMLogBridge{
showSQL: false,
}
}
// NewXORMLogger generate logger for xorm FIXME: configable // NewXORMLogger generate logger for xorm FIXME: configable
func NewXORMLogger(bufferlen int64, mode, config string) { func NewXORMLogger(bufferlen int64, mode, config string) {
logger := newLogger(bufferlen) logger := newLogger(bufferlen)

4
modules/setting/setting.go
View file

@ -1096,6 +1096,10 @@ func NewXORMLogService(disableConsole bool) {
} }
log.XORMLogger.SetLevel(lvl) log.XORMLogger.SetLevel(lvl)
} }
if len(logConfigs) == 0 {
log.DiscardXORMLogger()
}
} }
func newCacheService() { func newCacheService() {