mirror of
https://github.com/nabbar/golib.git
synced 2025-09-26 20:01:15 +08:00
61a73ba606
- fix bug with cert type marshall/unmarshall - add old config to allow retro compatibility - add new type function to retrieve a tls root ca cert instead of a slice of string to get root ca Package HTTPCli: - fix default DNS Mapper - optimze global DNS Mapper - fix non closing sub goroutine Package HTTPCli/DNS-Mapper: - change request function of Root CA with function of root ca cert instance - add function to return a root ca cert from a function that return a slice of root ca string Package Config/Components: - httpcli: bump sub package of certificate, httpcli - httpcli: adjust code following bump - httpcli: change request function of Root CA with function of root ca cert instance - httpcli: add function to return a root ca cert from a function that return a slice of root ca string - tls: change request function of Root CA with function of root ca cert instance - tls: add function to return a root ca cert from a function that return a slice of root ca string Package IOUtils/mapCloser: - fix bug with mapcloser not stopped - optimize code & goroutine Package Logger: - rework mapCloser call - optimize mapClaoser managment Package Request: - rework error managment - using []byte instead of buffer to read response body - add free capability - optimize memory consumption Package Socket / Server: - add filtering error capability - add params to specify a function called on each new connection and before using the connection - the new function param allow to update the network incomming connection (like buffer, deadline...) - rework some useless atomic to direct value to optimize code Package Socket/Delim: - rework to optimize memory & variable use - remove capabilities of update the instance when running, prefert recreate new one if necessary Other: - bump dependencies - minor bug / fix
110 lines
2.8 KiB
Go
110 lines
2.8 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 logger
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
|
|
loglvl "github.com/nabbar/golib/logger/level"
|
|
)
|
|
|
|
func (o *logger) Close() error {
|
|
if o != nil && o.hasCloser() {
|
|
o.switchCloser(nil)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *logger) Write(p []byte) (n int, err error) {
|
|
if o == nil {
|
|
return
|
|
} else if o.x == nil {
|
|
return
|
|
}
|
|
|
|
val := strings.TrimSpace(string(o.IOWriterFilter(p)))
|
|
|
|
if len(val) < 1 {
|
|
return len(p), nil
|
|
}
|
|
|
|
o.newEntry(o.GetIOWriterLevel(), val, nil, o.GetFields(), nil).Log()
|
|
return len(p), nil
|
|
}
|
|
|
|
func (o *logger) SetIOWriterLevel(lvl loglvl.Level) {
|
|
if o == nil {
|
|
return
|
|
} else if o.x == nil {
|
|
return
|
|
}
|
|
|
|
o.x.Store(keyWriter, lvl)
|
|
}
|
|
func (o *logger) GetIOWriterLevel() loglvl.Level {
|
|
if o == nil {
|
|
return loglvl.NilLevel
|
|
} else if o.x == nil {
|
|
return loglvl.NilLevel
|
|
} else if i, l := o.x.Load(keyWriter); !l {
|
|
return loglvl.NilLevel
|
|
} else if v, k := i.(loglvl.Level); !k {
|
|
return loglvl.NilLevel
|
|
} else {
|
|
return v
|
|
}
|
|
}
|
|
|
|
func (o *logger) SetIOWriterFilter(pattern string) {
|
|
if o == nil {
|
|
return
|
|
} else if o.x == nil {
|
|
return
|
|
}
|
|
|
|
o.x.Store(keyFilter, []byte(pattern))
|
|
}
|
|
|
|
func (o *logger) IOWriterFilter(p []byte) []byte {
|
|
if o == nil {
|
|
return p
|
|
} else if o.x == nil {
|
|
return p
|
|
} else if i, l := o.x.Load(keyFilter); !l {
|
|
return p
|
|
} else if v, k := i.([]byte); !k {
|
|
return p
|
|
} else if bytes.Contains(p, v) {
|
|
return make([]byte, 0)
|
|
} else {
|
|
return p
|
|
}
|
|
}
|