mirror of
https://github.com/nabbar/golib.git
synced 2025-11-01 19:42:35 +08:00
- Remove logger as globals to use dedicated pointer (#104)
# Refactor Logger : - Remove logger as globals to use dedicated pointer - Add compat file to allow retro-compatibility (function are deprecated) - Add field management to allow add custom information - Add option struct to manage options - Add entry struct to manage all log entry - Add multithreading capabilities (with race prevention) - Allow to log to file + stdout/stderr + syslog - Add io.WriteCloser compatibility interface - Add logrus hook to manage option by hook instance - Add capabilities to custom each logfile/syslog/standard independently - Add small test suite # Update Packages for logger new options : - archive - cluster - context - httpcli - httpserver - ldap - tests # Other : - bump dependancies - update minio server for aws test
This commit is contained in:
143
logger/hooksyslog.go
Normal file
143
logger/hooksyslog.go
Normal file
@@ -0,0 +1,143 @@
|
||||
/***********************************************************************************************************************
|
||||
*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2021 Nicolas JUHEL
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*
|
||||
**********************************************************************************************************************/
|
||||
|
||||
package logger
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"log/syslog"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type HookSyslog interface {
|
||||
logrus.Hook
|
||||
io.WriteCloser
|
||||
RegisterHook(log *logrus.Logger)
|
||||
}
|
||||
|
||||
type _HookSyslog struct {
|
||||
w *syslog.Writer
|
||||
l []logrus.Level
|
||||
s bool
|
||||
d bool
|
||||
t bool
|
||||
}
|
||||
|
||||
func NewHookSyslog(opt OptionsSyslog) (HookSyslog, error) {
|
||||
var (
|
||||
LVLs = make([]logrus.Level, 0)
|
||||
sys *syslog.Writer
|
||||
err error
|
||||
)
|
||||
|
||||
if len(opt.LogLevel) > 0 {
|
||||
for _, ls := range opt.LogLevel {
|
||||
LVLs = append(LVLs, GetLevelString(ls).Logrus())
|
||||
}
|
||||
} else {
|
||||
LVLs = logrus.AllLevels
|
||||
}
|
||||
|
||||
if sys, err = syslog.Dial(opt.Network.String(), opt.Host, opt.Priority, opt.Tag); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &_HookSyslog{
|
||||
w: sys,
|
||||
l: LVLs,
|
||||
s: opt.DisableStack,
|
||||
d: opt.DisableTimestamp,
|
||||
t: opt.EnableTrace,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) RegisterHook(log *logrus.Logger) {
|
||||
log.AddHook(o)
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) Levels() []logrus.Level {
|
||||
return o.l
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) Fire(entry *logrus.Entry) error {
|
||||
ent := entry.Dup()
|
||||
|
||||
if o.s {
|
||||
ent.Data = o.filterKey(ent.Data, FieldStack)
|
||||
}
|
||||
|
||||
if o.d {
|
||||
ent.Data = o.filterKey(ent.Data, FieldTime)
|
||||
}
|
||||
|
||||
if !o.t {
|
||||
ent.Data = o.filterKey(ent.Data, FieldCaller)
|
||||
ent.Data = o.filterKey(ent.Data, FieldFile)
|
||||
ent.Data = o.filterKey(ent.Data, FieldLine)
|
||||
}
|
||||
|
||||
if p, err := ent.Bytes(); err != nil {
|
||||
return err
|
||||
} else if _, err = o.Write(p); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) Write(p []byte) (n int, err error) {
|
||||
if o.w == nil {
|
||||
return 0, fmt.Errorf("logrus.hooksyslog: connection not setup")
|
||||
}
|
||||
|
||||
return o.w.Write(p)
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) Close() error {
|
||||
err := o.w.Close()
|
||||
o.w = nil
|
||||
return err
|
||||
}
|
||||
|
||||
func (o *_HookSyslog) filterKey(f logrus.Fields, key string) logrus.Fields {
|
||||
if len(f) < 1 {
|
||||
return f
|
||||
}
|
||||
|
||||
var res = make(map[string]interface{}, 0)
|
||||
|
||||
for k, v := range f {
|
||||
if k == key {
|
||||
continue
|
||||
}
|
||||
res[k] = v
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
Reference in New Issue
Block a user