From 9cfee6695e4fe52d7c33dd9d98932a08e6f0228c Mon Sep 17 00:00:00 2001 From: boyce Date: Wed, 27 Mar 2019 14:24:08 +0800 Subject: [PATCH] fixed log call depth. --- originnode/global.go | 39 --------------------------------------- sysmodule/LogModule.go | 2 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 originnode/global.go diff --git a/originnode/global.go b/originnode/global.go deleted file mode 100644 index 9157465..0000000 --- a/originnode/global.go +++ /dev/null @@ -1,39 +0,0 @@ -package originnode - -import ( - _ "net/http/pprof" -) - -/* -type GlobalModule struct { - service.BaseModule -} - -// 全局模块定义 -var g_module GlobalModule - -func AddModule(module service.IModule) uint32 { - return g_module.AddModule(module) -} - -func GetModuleById(moduleId uint32) service.IModule { - return g_module.GetModuleById(moduleId) -} - -func GetLog(logmodule uint32) sysmodule.ILogger { - module := g_module.GetModuleById(logmodule) - if nil == module { - return nil - } - - return module.(sysmodule.ILogger) -} - -func InitGlobalModule(exit chan bool, pwaitGroup *sync.WaitGroup) { - g_module.InitModule(exit, pwaitGroup) -} - -func RunGlobalModule() { - go g_module.RunModule(&g_module) -} -*/ diff --git a/sysmodule/LogModule.go b/sysmodule/LogModule.go index b6e6e57..5ddb239 100644 --- a/sysmodule/LogModule.go +++ b/sysmodule/LogModule.go @@ -113,7 +113,7 @@ func (slf *LogModule) Printf(level uint, format string, v ...interface{}) { var file string var line int var ok bool - _, file, line, ok = runtime.Caller(3) + _, file, line, ok = runtime.Caller(slf.calldepth - 1) if !ok { file = "???" line = 0