9c5ceb70 by asta.xie

Logs: modify StartLogger to private

1 parent bf0b1af6
...@@ -97,12 +97,12 @@ func (w *FileLogWriter) Init(jsonconfig string) error { ...@@ -97,12 +97,12 @@ func (w *FileLogWriter) Init(jsonconfig string) error {
97 if len(w.Filename) == 0 { 97 if len(w.Filename) == 0 {
98 return errors.New("jsonconfig must have filename") 98 return errors.New("jsonconfig must have filename")
99 } 99 }
100 err = w.StartLogger() 100 err = w.startLogger()
101 return err 101 return err
102 } 102 }
103 103
104 // start file logger. create log file and set to locker-inside file writer. 104 // start file logger. create log file and set to locker-inside file writer.
105 func (w *FileLogWriter) StartLogger() error { 105 func (w *FileLogWriter) startLogger() error {
106 fd, err := w.createLogFile() 106 fd, err := w.createLogFile()
107 if err != nil { 107 if err != nil {
108 return err 108 return err
...@@ -199,7 +199,7 @@ func (w *FileLogWriter) DoRotate() error { ...@@ -199,7 +199,7 @@ func (w *FileLogWriter) DoRotate() error {
199 } 199 }
200 200
201 // re-start logger 201 // re-start logger
202 err = w.StartLogger() 202 err = w.startLogger()
203 if err != nil { 203 if err != nil {
204 return fmt.Errorf("Rotate StartLogger: %s\n", err) 204 return fmt.Errorf("Rotate StartLogger: %s\n", err)
205 } 205 }
......
...@@ -67,7 +67,7 @@ func NewLogger(channellen int64) *BeeLogger { ...@@ -67,7 +67,7 @@ func NewLogger(channellen int64) *BeeLogger {
67 bl.msg = make(chan *logMsg, channellen) 67 bl.msg = make(chan *logMsg, channellen)
68 bl.outputs = make(map[string]LoggerInterface) 68 bl.outputs = make(map[string]LoggerInterface)
69 //bl.SetLogger("console", "") // default output to console 69 //bl.SetLogger("console", "") // default output to console
70 go bl.StartLogger() 70 go bl.startLogger()
71 return bl 71 return bl
72 } 72 }
73 73
...@@ -78,7 +78,10 @@ func (bl *BeeLogger) SetLogger(adaptername string, config string) error { ...@@ -78,7 +78,10 @@ func (bl *BeeLogger) SetLogger(adaptername string, config string) error {
78 defer bl.lock.Unlock() 78 defer bl.lock.Unlock()
79 if log, ok := adapters[adaptername]; ok { 79 if log, ok := adapters[adaptername]; ok {
80 lg := log() 80 lg := log()
81 lg.Init(config) 81 err := lg.Init(config)
82 if err != nil {
83 return err
84 }
82 bl.outputs[adaptername] = lg 85 bl.outputs[adaptername] = lg
83 return nil 86 return nil
84 } else { 87 } else {
...@@ -138,7 +141,7 @@ func (bl *BeeLogger) EnableFuncCallDepth(b bool) { ...@@ -138,7 +141,7 @@ func (bl *BeeLogger) EnableFuncCallDepth(b bool) {
138 141
139 // start logger chan reading. 142 // start logger chan reading.
140 // when chan is full, write logs. 143 // when chan is full, write logs.
141 func (bl *BeeLogger) StartLogger() { 144 func (bl *BeeLogger) startLogger() {
142 for { 145 for {
143 select { 146 select {
144 case bm := <-bl.msg: 147 case bm := <-bl.msg:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!