From d6748284bd6b4424d0e50cb4b952d12c74203960 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 22 Feb 2017 19:44:51 +0800 Subject: [PATCH] fix panic when push but the only log mode console is disabled by serv and update commands (#1007) --- modules/log/xorm.go | 7 +++++++ modules/setting/setting.go | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/modules/log/xorm.go b/modules/log/xorm.go index 9b23d9f370..113cfdad53 100644 --- a/modules/log/xorm.go +++ b/modules/log/xorm.go @@ -22,6 +22,13 @@ var ( XORMLogger *XORMLogBridge ) +// DiscardXORMLogger inits a blank logger for xorm +func DiscardXORMLogger() { + XORMLogger = &XORMLogBridge{ + showSQL: false, + } +} + // NewXORMLogger generate logger for xorm FIXME: configable func NewXORMLogger(bufferlen int64, mode, config string) { logger := newLogger(bufferlen) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index fbb283a9da..dd06691dc3 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1096,6 +1096,10 @@ func NewXORMLogService(disableConsole bool) { } log.XORMLogger.SetLevel(lvl) } + + if len(logConfigs) == 0 { + log.DiscardXORMLogger() + } } func newCacheService() {