增加服务启动与停止日志

This commit is contained in:
duanhf2012
2020-04-01 17:31:35 +08:00
parent 946408ca12
commit c1d6d44fbb
3 changed files with 16 additions and 5 deletions

View File

@@ -7,7 +7,6 @@ import (
"github.com/duanhf2012/origin/log" "github.com/duanhf2012/origin/log"
"github.com/duanhf2012/origin/service" "github.com/duanhf2012/origin/service"
"io/ioutil" "io/ioutil"
syslog "log"
"os" "os"
"os/signal" "os/signal"
"strconv" "strconv"
@@ -85,7 +84,6 @@ func initNode(id int){
} }
func Start() { func Start() {
SetSysLog("debug","./",syslog.Lshortfile|syslog.LstdFlags)
console.RegisterCommand("start",startNode) console.RegisterCommand("start",startNode)
console.RegisterCommand("stop",stopNode) console.RegisterCommand("stop",stopNode)
err := console.Run(os.Args) err := console.Run(os.Args)
@@ -107,6 +105,7 @@ func stopNode(arg interface{}) error {
} }
func startNode(paramNodeId interface{}) error { func startNode(paramNodeId interface{}) error {
log.Release("Start running server.")
initNode(paramNodeId.(int)) initNode(paramNodeId.(int))
cluster.GetCluster().Start() cluster.GetCluster().Start()
service.Start() service.Start()
@@ -123,6 +122,8 @@ func startNode(paramNodeId interface{}) error {
close(closeSig) close(closeSig)
service.WaitStop() service.WaitStop()
log.Debug("Server is stop.")
return nil return nil
} }

View File

@@ -3,7 +3,9 @@ package service
import ( import (
"fmt" "fmt"
"github.com/duanhf2012/origin/event" "github.com/duanhf2012/origin/event"
"github.com/duanhf2012/origin/log"
"github.com/duanhf2012/origin/util/timer" "github.com/duanhf2012/origin/util/timer"
"reflect"
"time" "time"
) )
@@ -24,6 +26,7 @@ type IModule interface {
getBaseModule() IModule getBaseModule() IModule
GetService() IService GetService() IService
GetEventChan() chan *event.Event GetEventChan() chan *event.Event
GetModuleName() string
} }
@@ -47,6 +50,7 @@ type Module struct {
//事件管道 //事件管道
event.EventProcessor event.EventProcessor
moduleName string
//eventChan chan *SEvent //eventChan chan *SEvent
} }
@@ -64,6 +68,10 @@ func (slf *Module) GetModuleId() int64{
return slf.moduleId return slf.moduleId
} }
func (slf *Module) GetModuleName() string{
return slf.moduleName
}
func (slf *Module) OnInit() error{ func (slf *Module) OnInit() error{
return nil return nil
} }
@@ -86,7 +94,7 @@ func (slf *Module) AddModule(module IModule) (int64,error){
pAddModule.parent = slf.self pAddModule.parent = slf.self
pAddModule.dispatcher = slf.GetAncestor().getBaseModule().(*Module).dispatcher pAddModule.dispatcher = slf.GetAncestor().getBaseModule().(*Module).dispatcher
pAddModule.ancestor = slf.ancestor pAddModule.ancestor = slf.ancestor
pAddModule.moduleName = reflect.Indirect(reflect.ValueOf(module)).Type().Name()
err := module.OnInit() err := module.OnInit()
if err != nil { if err != nil {
return 0,err return 0,err
@@ -95,6 +103,7 @@ func (slf *Module) AddModule(module IModule) (int64,error){
slf.child[module.GetModuleId()] = module slf.child[module.GetModuleId()] = module
slf.ancestor.getBaseModule().(*Module).descendants[module.GetModuleId()] = module slf.ancestor.getBaseModule().(*Module).descendants[module.GetModuleId()] = module
log.Debug("Add module %s completed",slf.GetModuleName())
return module.GetModuleId(),nil return module.GetModuleId(),nil
} }
@@ -107,6 +116,7 @@ func (slf *Module) ReleaseModule(moduleId int64){
slf.ReleaseModule(id) slf.ReleaseModule(id)
} }
pModule.self.OnRelease() pModule.self.OnRelease()
log.Debug("Release module %s.",slf.GetModuleName())
for pTimer,_ := range pModule.mapActiveTimer { for pTimer,_ := range pModule.mapActiveTimer {
pTimer.Stop() pTimer.Stop()
} }

View File

@@ -85,7 +85,7 @@ func (slf *Service) Start() {
} }
func (slf *Service) Run() { func (slf *Service) Run() {
log.Debug("Start running Service %s.",slf.GetName())
defer slf.wg.Done() defer slf.wg.Done()
var bStop = false var bStop = false
for{ for{
@@ -130,8 +130,8 @@ func (slf *Service) Release(){
log.Error("core dump info:%+v\n",err) log.Error("core dump info:%+v\n",err)
} }
}() }()
slf.this.OnRelease() slf.this.OnRelease()
log.Debug("Release Service %s.",slf.GetName())
} }
func (slf *Service) OnRelease(){ func (slf *Service) OnRelease(){