mirror of
https://github.com/nabbar/golib.git
synced 2025-09-27 04:06:05 +08:00
f31950daef
- Rework logger - Remove deprecated functions - Split Logger to sub package (fields, level, config, ...) - Optimize dependencies - Rework Hookfile: fix error like FD still opened - Rework Hooksyslog: use same model like Hookfile, use network/protocol instead of self lib - Rework HookStd: use independent hook for std out & std err - Fix std config make generic options for files & syslog - Apply formatter to hook instead of main logger entry - optimize code Package ioutils: - rework PathCheckCreate funct: optimize code & fix some error Package Network: - create sub package protocol for all network protocl use - add encode function Package httpcli: - remove file network - use package network/protocol instead of network file Package archive: - apply change following rework of logger Package aws: - apply change following rework of logger Package cluster: - apply change following rework of logger Package cobra: - apply change following rework of logger Package Config Component: - apply change following rework of logger to component log - fix logger for monitoring - fix component following fix of package request / monitoring Package context: - apply change following rework of logger Package database: - apply change following rework of logger Package httpserver: - apply change following rework of logger Package ldap: - apply change following rework of logger Package monitor: - apply change following rework of logger - fix logger for monitoring - fix minor bugs Package nats: - apply change following rework of logger Package nutsdb: - apply change following rework of logger Package request: - apply change following rework of logger - fix minor bug - fix missing logger for monitoring - add one line for healthcheck (info or error) Package router: - apply change following rework of logger Package static: - apply change following rework of logger Package status: - apply change following rework of logger - fix bug with mandatory component Package viper: - apply change following rework of logger Other: - bump dependencies - github action workflow fix
133 lines
3.0 KiB
Go
133 lines
3.0 KiB
Go
/***********************************************************************************************************************
|
|
*
|
|
* 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 hookstdout
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"strings"
|
|
|
|
logtps "github.com/nabbar/golib/logger/types"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type hkstd struct {
|
|
w io.Writer
|
|
l []logrus.Level
|
|
f logrus.Formatter
|
|
s bool // Disable Stack
|
|
d bool // Disable Timestamp
|
|
t bool // Disable Trace
|
|
c bool // Disable Color
|
|
a bool // Enable AccessLog
|
|
}
|
|
|
|
func (o *hkstd) getFormatter() logrus.Formatter {
|
|
return o.f
|
|
}
|
|
|
|
func (o *hkstd) Run(ctx context.Context) {
|
|
return
|
|
}
|
|
|
|
func (o *hkstd) Levels() []logrus.Level {
|
|
return o.l
|
|
}
|
|
|
|
func (o *hkstd) RegisterHook(log *logrus.Logger) {
|
|
log.AddHook(o)
|
|
}
|
|
|
|
func (o *hkstd) Fire(entry *logrus.Entry) error {
|
|
ent := entry.Dup()
|
|
ent.Level = entry.Level
|
|
|
|
if o.s {
|
|
ent.Data = o.filterKey(ent.Data, logtps.FieldStack)
|
|
}
|
|
|
|
if o.d {
|
|
ent.Data = o.filterKey(ent.Data, logtps.FieldTime)
|
|
}
|
|
|
|
if !o.t {
|
|
ent.Data = o.filterKey(ent.Data, logtps.FieldCaller)
|
|
ent.Data = o.filterKey(ent.Data, logtps.FieldFile)
|
|
ent.Data = o.filterKey(ent.Data, logtps.FieldLine)
|
|
}
|
|
|
|
var (
|
|
p []byte
|
|
e error
|
|
)
|
|
|
|
if o.a {
|
|
if len(entry.Message) > 0 {
|
|
if !strings.HasSuffix(entry.Message, "\n") {
|
|
entry.Message += "\n"
|
|
}
|
|
p = []byte(entry.Message)
|
|
} else {
|
|
return nil
|
|
}
|
|
} else {
|
|
if len(ent.Data) < 1 {
|
|
return nil
|
|
}
|
|
|
|
if f := o.getFormatter(); f != nil {
|
|
p, e = f.Format(ent)
|
|
} else {
|
|
p, e = ent.Bytes()
|
|
}
|
|
|
|
if e != nil {
|
|
return e
|
|
}
|
|
}
|
|
|
|
if _, e = o.Write(p); e != nil {
|
|
return e
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *hkstd) filterKey(f logrus.Fields, key string) logrus.Fields {
|
|
if len(f) < 1 {
|
|
return f
|
|
}
|
|
|
|
if _, ok := f[key]; !ok {
|
|
return f
|
|
} else {
|
|
delete(f, key)
|
|
return f
|
|
}
|
|
}
|