|
|
|
|
@ -319,17 +319,19 @@ func (l *ActiveLogger) Log (entry *Entry) error {
|
|
|
|
|
if entry.Logger == nil {
|
|
|
|
|
entry.Logger = l
|
|
|
|
|
}
|
|
|
|
|
return l.handleEntry(entry)
|
|
|
|
|
return l.logEntry(entry)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (l *ActiveLogger) log (level Level, msg string, err error,options []EntryFnc) {
|
|
|
|
|
_ = l.handleEntry(AcquireEntry(l, level, msg, err, options...)) }
|
|
|
|
|
_ = l.logEntry(AcquireEntry(l, level, msg, err, options...)) }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (l *ActiveLogger) logEntry (entry *Entry) error {
|
|
|
|
|
l.Lock()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (l *ActiveLogger) logEntry(entry *Entry) error {
|
|
|
|
|
l.Lock()
|
|
|
|
|
|
|
|
|
|
if l.state != StateStarted {
|
|
|
|
|
l.Unlock()
|
|
|
|
|
return G.ErrLoggerNotStarted
|
|
|
|
|
@ -347,7 +349,7 @@ func (l *ActiveLogger) logEntry (entry *Entry) error {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !l.asyncMode {
|
|
|
|
|
er := l.handleEntry(entry)
|
|
|
|
|
er := l.dispatchEntry(entry)
|
|
|
|
|
l.Unlock()
|
|
|
|
|
return er
|
|
|
|
|
}
|
|
|
|
|
@ -359,7 +361,7 @@ func (l *ActiveLogger) logEntry (entry *Entry) error {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (l *ActiveLogger) handleEntry(entry *Entry) error {
|
|
|
|
|
func (l *ActiveLogger) dispatchEntry(entry *Entry) error {
|
|
|
|
|
|
|
|
|
|
er := l.handleLoggers(entry,func(c Logger, e *Entry) error { return c.Log(e) },G.FmtMsgLogErr)
|
|
|
|
|
|
|
|
|
|
@ -397,7 +399,7 @@ func (l *ActiveLogger) handleError (err error, entry *Entry) {
|
|
|
|
|
|
|
|
|
|
func (l *ActiveLogger) handleQueue() {
|
|
|
|
|
for en := l.queue.Pop(); en != nil; {
|
|
|
|
|
_ = l.handleEntry(en)
|
|
|
|
|
_ = l.dispatchEntry(en)
|
|
|
|
|
en = l.queue.Pop()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -452,7 +454,7 @@ func (l *ActiveLogger) runLogger () {
|
|
|
|
|
}
|
|
|
|
|
w.Add(1)
|
|
|
|
|
l.Lock()
|
|
|
|
|
_ = l.handleEntry(e)
|
|
|
|
|
_ = l.dispatchEntry(e)
|
|
|
|
|
l.Unlock()
|
|
|
|
|
w.Done()
|
|
|
|
|
|
|
|
|
|
|