diff --git a/g/database/gdb/gdb_base.go b/g/database/gdb/gdb_base.go index 5feeab3f3..811ed1ec4 100644 --- a/g/database/gdb/gdb_base.go +++ b/g/database/gdb/gdb_base.go @@ -74,11 +74,10 @@ func (db *Db) printSql(v *Sql) { ) if v.Error != nil { s += "\nError: " + v.Error.Error() - glog.Error(s) + glog.Backtrace(true, 1).Error(s) } else { glog.Debug(s) } - } // 关闭链接 diff --git a/g/os/glog/glog.go b/g/os/glog/glog.go index 009fc6c3c..8dd5ca8d1 100644 --- a/g/os/glog/glog.go +++ b/g/os/glog/glog.go @@ -45,11 +45,6 @@ func GetPath() string { return logger.path.Val() } -// 设置下一次输出的分类,支持多级分类设置 -func Cat(category string) *Logger { - return logger.Cat(category) -} - // 打印文件调用回溯信息 func PrintBacktrace(skip...int) { customSkip := 1 @@ -75,6 +70,21 @@ func SetStdPrint(open bool) { logger.SetStdPrint(open) } +// 设置下一次输出的分类,支持多级分类设置 +func Cat(category string) *Logger { + return logger.Cat(category) +} + +// 设置文件调用回溯信息 +func Backtrace(enabled bool, skip...int) *Logger { + return logger.Backtrace(enabled, skip...) +} + +// 是否允许在设置输出文件时同时也输出到终端 +func StdPrint(enabled bool) *Logger { + return logger.StdPrint(enabled) +} + func Print(v ...interface{}) { logger.Print(v ...) } diff --git a/g/os/glog/glog_logger.go b/g/os/glog/glog_logger.go index 72e8fb270..3923934f4 100644 --- a/g/os/glog/glog_logger.go +++ b/g/os/glog/glog_logger.go @@ -129,8 +129,8 @@ func (l *Logger) SetPath(path string) error { // 设置写日志时开启or关闭控制台打印,默认是关闭的 // @author zseeker // @date 2018-05-24 -func (l *Logger) SetStdPrint(open bool) { - l.allowMulti.Set(open) +func (l *Logger) SetStdPrint(enabled bool) { + l.allowMulti.Set(enabled) } // 这里的写锁保证统一时刻只会写入一行日志,防止串日志的情况 diff --git a/g/os/glog/glog_logger_linkop.go b/g/os/glog/glog_logger_linkop.go index 8f27b2918..095f68121 100644 --- a/g/os/glog/glog_logger_linkop.go +++ b/g/os/glog/glog_logger_linkop.go @@ -38,4 +38,16 @@ func (l *Logger) Backtrace(enabled bool, skip...int) *Logger { logger.SetBacktraceSkip(skip[0]) } return logger +} + +// 是否允许在设置输出文件时同时也输出到终端 +func (l *Logger) StdPrint(enabled bool) *Logger { + logger := (*Logger)(nil) + if l.pr == nil { + logger = l.Clone() + } else { + logger = l + } + logger.SetStdPrint(enabled) + return logger } \ No newline at end of file