From c1d6d44fbbc74e72c6bb70009db6f4851b78c57a Mon Sep 17 00:00:00 2001 From: duanhf2012 Date: Wed, 1 Apr 2020 17:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E4=B8=8E=E5=81=9C=E6=AD=A2=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node/node.go | 5 +++-- service/module.go | 12 +++++++++++- service/service.go | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/node/node.go b/node/node.go index 2791d60..f51d9f4 100644 --- a/node/node.go +++ b/node/node.go @@ -7,7 +7,6 @@ import ( "github.com/duanhf2012/origin/log" "github.com/duanhf2012/origin/service" "io/ioutil" - syslog "log" "os" "os/signal" "strconv" @@ -85,7 +84,6 @@ func initNode(id int){ } func Start() { - SetSysLog("debug","./",syslog.Lshortfile|syslog.LstdFlags) console.RegisterCommand("start",startNode) console.RegisterCommand("stop",stopNode) err := console.Run(os.Args) @@ -107,6 +105,7 @@ func stopNode(arg interface{}) error { } func startNode(paramNodeId interface{}) error { + log.Release("Start running server.") initNode(paramNodeId.(int)) cluster.GetCluster().Start() service.Start() @@ -123,6 +122,8 @@ func startNode(paramNodeId interface{}) error { close(closeSig) service.WaitStop() + + log.Debug("Server is stop.") return nil } diff --git a/service/module.go b/service/module.go index cc006d1..2a4e048 100644 --- a/service/module.go +++ b/service/module.go @@ -3,7 +3,9 @@ package service import ( "fmt" "github.com/duanhf2012/origin/event" + "github.com/duanhf2012/origin/log" "github.com/duanhf2012/origin/util/timer" + "reflect" "time" ) @@ -24,6 +26,7 @@ type IModule interface { getBaseModule() IModule GetService() IService GetEventChan() chan *event.Event + GetModuleName() string } @@ -47,6 +50,7 @@ type Module struct { //事件管道 event.EventProcessor + moduleName string //eventChan chan *SEvent } @@ -64,6 +68,10 @@ func (slf *Module) GetModuleId() int64{ return slf.moduleId } +func (slf *Module) GetModuleName() string{ + return slf.moduleName +} + func (slf *Module) OnInit() error{ return nil } @@ -86,7 +94,7 @@ func (slf *Module) AddModule(module IModule) (int64,error){ pAddModule.parent = slf.self pAddModule.dispatcher = slf.GetAncestor().getBaseModule().(*Module).dispatcher pAddModule.ancestor = slf.ancestor - + pAddModule.moduleName = reflect.Indirect(reflect.ValueOf(module)).Type().Name() err := module.OnInit() if err != nil { return 0,err @@ -95,6 +103,7 @@ func (slf *Module) AddModule(module IModule) (int64,error){ slf.child[module.GetModuleId()] = module slf.ancestor.getBaseModule().(*Module).descendants[module.GetModuleId()] = module + log.Debug("Add module %s completed",slf.GetModuleName()) return module.GetModuleId(),nil } @@ -107,6 +116,7 @@ func (slf *Module) ReleaseModule(moduleId int64){ slf.ReleaseModule(id) } pModule.self.OnRelease() + log.Debug("Release module %s.",slf.GetModuleName()) for pTimer,_ := range pModule.mapActiveTimer { pTimer.Stop() } diff --git a/service/service.go b/service/service.go index 632c922..f733bc8 100644 --- a/service/service.go +++ b/service/service.go @@ -85,7 +85,7 @@ func (slf *Service) Start() { } func (slf *Service) Run() { - + log.Debug("Start running Service %s.",slf.GetName()) defer slf.wg.Done() var bStop = false for{ @@ -130,8 +130,8 @@ func (slf *Service) Release(){ log.Error("core dump info:%+v\n",err) } }() - slf.this.OnRelease() + log.Debug("Release Service %s.",slf.GetName()) } func (slf *Service) OnRelease(){