Implement LoggerService + refactoring (incomplete)

This commit is contained in:
ionutboangiu
2025-01-14 19:50:47 +02:00
committed by Dan Christian Bogos
parent e7152dacf8
commit 04f746c634
10 changed files with 170 additions and 124 deletions

View File

@@ -994,6 +994,7 @@ const (
ServiceManagerS = "ServiceManager"
CommonListenerS = "CommonListenerS"
ConnManager = "ConnManager"
LoggerS = "LoggerS"
)
// Lower service names

View File

@@ -31,9 +31,9 @@ var noSysLog bool
func init() {
var err error
if Logger, err = NewLogger(MetaSysLog, EmptyString, 0); err != nil {
noSysLog = true
Logger, _ = NewLogger(MetaStdLog, EmptyString, 0)
Logger, err = NewSysLogger(EmptyString, 0)
if err != nil {
Logger = NewStdLogger(EmptyString, 0)
}
}
@@ -65,20 +65,6 @@ type LoggerInterface interface {
Write(p []byte) (n int, err error)
}
func NewLogger(loggerType, nodeID string, logLvl int) (LoggerInterface, error) {
switch loggerType {
case MetaStdLog:
return NewStdLogger(nodeID, logLvl), nil
case MetaSysLog:
if noSysLog {
return NewStdLogger(nodeID, logLvl), nil
}
return NewSysLogger(nodeID, logLvl)
default:
return nil, fmt.Errorf("unsupported logger: <%+s>", loggerType)
}
}
type SysLogger struct {
logLevel int
syslog *syslog.Writer

View File

@@ -28,30 +28,6 @@ import (
"testing"
)
func TestLoggerNewLoggerSyslogOK(t *testing.T) {
if noSysLog {
t.SkipNow()
}
exp := &SysLogger{
logLevel: 7,
}
if rcv, err := NewLogger(MetaSysLog, EmptyString, 7); err != nil {
t.Error(err)
} else {
exp.syslog = rcv.GetSyslog()
if !reflect.DeepEqual(rcv, exp) {
t.Errorf("expected: <%+v>, \nreceived: <%+v>", exp, rcv)
}
}
}
func TestLoggerNewLoggerUnsupported(t *testing.T) {
experr := `unsupported logger: <unsupported>`
if _, err := NewLogger("unsupported", EmptyString, 7); err == nil || err.Error() != experr {
t.Errorf("expected: <%s>, \nreceived: <%+v>", experr, err)
}
}
func TestLoggerSysloggerSetGetLogLevel(t *testing.T) {
if noSysLog {
t.SkipNow()