feat: change logger;

feat: update dependencies

cef_formatter.go

@@ -7,8 +7,6 @@ import (
 
 	syslog "github.com/RackSec/srslog"
 	"github.com/pcktdmp/cef/cefevent"
-
-	logging "github.com/NGRsoftlab/ngr-logging"
 )
 
 // CefHeader CEF header parameters
@@ -85,7 +83,7 @@ func MakeCefString(header CefHeader, contentMap map[string]interface{}, keysAreL
 
 	cef, err := event.Generate()
 	if err != nil {
-		logging.Logger.Errorf("bad cef generation: %s", err)
+		logger.Errorf("bad cef generation: %s", err)
 		return "", err
 	}
 

go.mod

@@ -3,12 +3,9 @@ module github.com/NGRsoftlab/ngr-sysloger
 go 1.22.3
 
 require (
-	github.com/NGRsoftlab/ngr-logging v1.0.0
 	github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91
 	github.com/pcktdmp/cef v0.2.0
+	github.com/sirupsen/logrus v1.9.3
 )
 
-require (
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-)
+require golang.org/x/sys v0.21.0 // indirect

go.sum

@@ -1,5 +1,3 @@
-github.com/NGRsoftlab/ngr-logging v1.0.0 h1:Yp42kvw/bofZ6xXC5jPlPx1HNabZQY9cvzGnB0earJY=
-github.com/NGRsoftlab/ngr-logging v1.0.0/go.mod h1:99kZ+XwSK7rKRitmhZvqOdYnPf9Qepywt3zjJJcJDME=
 github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91 h1:vX+gnvBc56EbWYrmlhYbFYRaeikAke1GL84N4BEYOFE=
 github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91/go.mod h1:cDLGBht23g0XQdLjzn6xOGXDkLK182YfINAaZEQLCHQ=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -15,8 +13,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logger.go

@@ -0,0 +1,23 @@
+// Copyright 2020-2024 NGR Softlab
+package sysloger
+
+import (
+	"io"
+	"os"
+
+	"github.com/sirupsen/logrus"
+)
+
+var (
+	logger = &logrus.Logger{
+		Out:   io.MultiWriter(os.Stderr),
+		Level: logrus.DebugLevel,
+		Formatter: &logrus.TextFormatter{
+			FullTimestamp:          true,
+			TimestampFormat:        "2006-01-02 15:04:05",
+			ForceColors:            true,
+			DisableLevelTruncation: true,
+		},
+		ReportCaller: true,
+	}
+)

syslog_utils.go

@@ -5,8 +5,6 @@ import (
 	"time"
 
 	syslog "github.com/RackSec/srslog"
-
-	logging "github.com/NGRsoftlab/ngr-logging"
 )
 
 /////////////////////////////////////////////////////////
@@ -17,7 +15,7 @@ import (
 func SendListToSyslog(params SyslogParams, formatter syslog.Formatter, msgList []string) error {
 	writer, err := NewSyslogWriter(params, formatter)
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to create writer: %s", err.Error())
+		logger.Errorf("ERROR failed to create writer: %s", err.Error())
 		return err
 	}
 
@@ -26,7 +24,7 @@ func SendListToSyslog(params SyslogParams, formatter syslog.Formatter, msgList [
 	for i, msg := range msgList {
 		_, errW := doSuitableMethod(writer, params.Level, msg)
 		if errW != nil {
-			logging.Logger.Warningf("ERROR writing to syslog: %d %v", i, errW)
+			logger.Warningf("ERROR writing to syslog: %d %v", i, errW)
 		}
 	}
 
@@ -37,15 +35,15 @@ func SendListToSyslog(params SyslogParams, formatter syslog.Formatter, msgList [
 func SendSingleSyslogMsg(params SyslogParams, formatter syslog.Formatter, msg string) error {
 	writer, err := NewSyslogWriter(params, formatter)
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to create writer: %s", err.Error())
+		logger.Errorf("ERROR failed to create writer: %s", err.Error())
 		return err
 	}
 
 	defer func() { _ = writer.Close() }()
 
 	_, errW := doSuitableMethod(writer, params.Level, msg)
 	if errW != nil {
-		logging.Logger.Errorf("ERROR writing to syslog: %s", errW.Error())
+		logger.Errorf("ERROR writing to syslog: %s", errW.Error())
 		return errW
 	}
 
@@ -56,7 +54,7 @@ func SendSingleSyslogMsg(params SyslogParams, formatter syslog.Formatter, msg st
 func SendListToSyslogWithTimeout(params SyslogParams, formatter syslog.Formatter, msgList []string, timeout time.Duration) error {
 	writer, err := NewSyslogWriterWithTimeout(params, formatter, timeout)
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to create writer: %s", err.Error())
+		logger.Errorf("ERROR failed to create writer: %s", err.Error())
 		return err
 	}
 
@@ -65,7 +63,7 @@ func SendListToSyslogWithTimeout(params SyslogParams, formatter syslog.Formatter
 	for i, msg := range msgList {
 		_, errW := doSuitableMethod(writer, params.Level, msg)
 		if errW != nil {
-			logging.Logger.Warningf("ERROR writing to syslog: %d %v", i, errW)
+			logger.Warningf("ERROR writing to syslog: %d %v", i, errW)
 		}
 	}
 
@@ -76,15 +74,15 @@ func SendListToSyslogWithTimeout(params SyslogParams, formatter syslog.Formatter
 func SendSingleSyslogMsgWithTimeout(params SyslogParams, formatter syslog.Formatter, msg string, timeout time.Duration) error {
 	writer, err := NewSyslogWriterWithTimeout(params, formatter, timeout)
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to create writer: %s", err.Error())
+		logger.Errorf("ERROR failed to create writer: %s", err.Error())
 		return err
 	}
 
 	defer func() { _ = writer.Close() }()
 
 	_, errW := doSuitableMethod(writer, params.Level, msg)
 	if errW != nil {
-		logging.Logger.Errorf("ERROR writing to syslog: %s", errW.Error())
+		logger.Errorf("ERROR writing to syslog: %s", errW.Error())
 		return errW
 	}
 

sysloger.go

@@ -9,8 +9,6 @@ import (
 	"time"
 
 	syslog "github.com/RackSec/srslog"
-
-	logging "github.com/NGRsoftlab/ngr-logging"
 )
 
 // SyslogParams syslog dial params
@@ -34,7 +32,7 @@ func NewSyslogWriter(params SyslogParams, formatter syslog.Formatter) (*syslog.W
 
 	if params.NeedTls {
 		if params.TlsConf == nil {
-			logging.Logger.Error("ERROR nil TlsConf")
+			logger.Error("ERROR nil TlsConf")
 			return nil, errors.New("nil TlsConf")
 		}
 
@@ -46,7 +44,7 @@ func NewSyslogWriter(params SyslogParams, formatter syslog.Formatter) (*syslog.W
 	}
 
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to dial syslog: %s", err.Error())
+		logger.Errorf("ERROR failed to dial syslog: %s", err.Error())
 		return nil, err
 	}
 
@@ -65,7 +63,7 @@ func NewSyslogWriterWithTimeout(params SyslogParams, formatter syslog.Formatter,
 
 	if params.NeedTls {
 		if params.TlsConf == nil {
-			logging.Logger.Error("ERROR nil TlsConf")
+			logger.Error("ERROR nil TlsConf")
 			return nil, errors.New("nil TlsConf")
 		}
 
@@ -84,7 +82,7 @@ func NewSyslogWriterWithTimeout(params SyslogParams, formatter syslog.Formatter,
 	sysLogger, err = syslog.DialWithCustomDialer("custom", fmt.Sprintf("%s:%d", params.Host, params.Port),
 		params.Priority, params.Tag, dial)
 	if err != nil {
-		logging.Logger.Errorf("ERROR failed to dial syslog: %s", err.Error())
+		logger.Errorf("ERROR failed to dial syslog: %s", err.Error())
 		return nil, err
 	}