mirror of
https://github.com/duanhf2012/origin.git
synced 2026-02-16 00:44:42 +08:00
优化系统日志
This commit is contained in:
@@ -29,11 +29,11 @@ type COriginNode struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *COriginNode) Init() {
|
func (s *COriginNode) Init() {
|
||||||
|
|
||||||
//初始化全局模块
|
//初始化全局模块
|
||||||
InitGlobalModule()
|
InitGlobalModule()
|
||||||
service.InitLog()
|
service.InitLog()
|
||||||
service.InstanceServiceMgr().Init()
|
imodule := g_module.GetModuleByType(sysmodule.SYS_LOG)
|
||||||
|
service.InstanceServiceMgr().Init(imodule.(service.ILogger))
|
||||||
|
|
||||||
s.exit = make(chan bool)
|
s.exit = make(chan bool)
|
||||||
s.waitGroup = &sync.WaitGroup{}
|
s.waitGroup = &sync.WaitGroup{}
|
||||||
|
|||||||
16
service/Logger.go
Normal file
16
service/Logger.go
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
const (
|
||||||
|
LEVER_UNKNOW = 0
|
||||||
|
LEVER_DEBUG = 1
|
||||||
|
LEVER_INFO = 2
|
||||||
|
LEVER_WARN = 3
|
||||||
|
LEVER_ERROR = 4
|
||||||
|
LEVER_FATAL = 5
|
||||||
|
LEVEL_MAX = 6
|
||||||
|
)
|
||||||
|
|
||||||
|
type ILogger interface {
|
||||||
|
Printf(level uint, format string, v ...interface{})
|
||||||
|
Print(level uint, v ...interface{})
|
||||||
|
}
|
||||||
@@ -123,6 +123,7 @@ func (slf *BaseService) Init(iservice IService, servicetype int) error {
|
|||||||
slf.servicename = fmt.Sprintf("%T", iservice)
|
slf.servicename = fmt.Sprintf("%T", iservice)
|
||||||
parts := strings.Split(slf.servicename, ".")
|
parts := strings.Split(slf.servicename, ".")
|
||||||
if len(parts) != 2 {
|
if len(parts) != 2 {
|
||||||
|
GetLogger().Printf(LEVER_ERROR, "BaseService.Init: service name is error: %q", slf.servicename)
|
||||||
err := fmt.Errorf("BaseService.Init: service name is error: %q", slf.servicename)
|
err := fmt.Errorf("BaseService.Init: service name is error: %q", slf.servicename)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -137,7 +138,7 @@ func (slf *BaseService) Init(iservice IService, servicetype int) error {
|
|||||||
func (slf *BaseService) RPC_CheckServiceTickTimeOut(microSecond int64) error {
|
func (slf *BaseService) RPC_CheckServiceTickTimeOut(microSecond int64) error {
|
||||||
|
|
||||||
if slf.IsTimeOutTick(microSecond) == true {
|
if slf.IsTimeOutTick(microSecond) == true {
|
||||||
Log.Printf("service:%s is timeout,state:%d", slf.GetServiceName(), slf.GetStatus())
|
// Log.Printf("service:%s is timeout,state:%d", slf.GetServiceName(), slf.GetStatus())
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -227,6 +228,7 @@ func (slf *BaseModule) RunModule(module IModule, exit chan bool, pwaitGroup *syn
|
|||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-exit:
|
case <-exit:
|
||||||
|
GetLogger().Printf(LEVER_WARN, "stopping module %s...", fmt.Sprintf("%T", slf))
|
||||||
fmt.Println("stopping module %s...", fmt.Sprintf("%T", slf))
|
fmt.Println("stopping module %s...", fmt.Sprintf("%T", slf))
|
||||||
return nil
|
return nil
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
type IServiceManager interface {
|
type IServiceManager interface {
|
||||||
Setup(s IService) bool
|
Setup(s IService) bool
|
||||||
Init() bool
|
Init(logger ILogger) bool
|
||||||
Start() bool
|
Start() bool
|
||||||
CreateServiceID() int
|
CreateServiceID() int
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,7 @@ type IServiceManager interface {
|
|||||||
type CServiceManager struct {
|
type CServiceManager struct {
|
||||||
genserviceid int
|
genserviceid int
|
||||||
localserviceMap map[string]IService
|
localserviceMap map[string]IService
|
||||||
|
logger ILogger
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *CServiceManager) Setup(s IService) bool {
|
func (slf *CServiceManager) Setup(s IService) bool {
|
||||||
@@ -43,8 +44,9 @@ func (slf *CServiceManager) FetchService(s FetchService) IService {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (slf *CServiceManager) Init() bool {
|
func (slf *CServiceManager) Init(logger ILogger) bool {
|
||||||
|
|
||||||
|
slf.logger = logger
|
||||||
for _, s := range slf.localserviceMap {
|
for _, s := range slf.localserviceMap {
|
||||||
(s.(IModule)).InitModule(s.(IModule))
|
(s.(IModule)).InitModule(s.(IModule))
|
||||||
}
|
}
|
||||||
@@ -103,6 +105,10 @@ func (slf *CServiceManager) Get() bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (slf *CServiceManager) GetLogger() ILogger {
|
||||||
|
return slf.logger
|
||||||
|
}
|
||||||
|
|
||||||
var _self *CServiceManager
|
var _self *CServiceManager
|
||||||
|
|
||||||
func InstanceServiceMgr() *CServiceManager {
|
func InstanceServiceMgr() *CServiceManager {
|
||||||
@@ -113,3 +119,7 @@ func InstanceServiceMgr() *CServiceManager {
|
|||||||
}
|
}
|
||||||
return _self
|
return _self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetLogger() ILogger {
|
||||||
|
return InstanceServiceMgr().GetLogger()
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user