diff --git a/go.mod b/go.mod index f8a8935..b2912e6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/goccy/go-yaml v1.9.1 github.com/mattn/go-isatty v0.0.13 // indirect github.com/pkg/errors v0.8.1 - github.com/sirupsen/logrus v1.7.0 github.com/spf13/cast v1.3.1 github.com/stretchr/testify v1.5.1 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect diff --git a/go.sum b/go.sum index fd3cc88..65d5fe8 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -40,7 +38,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= diff --git a/middleware/logger.go b/middleware/logger.go index bed96ca..d8807d4 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -1,54 +1,21 @@ package middleware import ( - "github.com/sirupsen/logrus" + "encoding/json" + "log" + tele "gopkg.in/tucnak/telebot.v3" ) -type LoggerFieldsFunc = func(tele.Context) logrus.Fields - -func Logger(logger *logrus.Logger, fieldsFunc ...LoggerFieldsFunc) tele.MiddlewareFunc { +func Logger(logger *log.Logger) tele.MiddlewareFunc { if logger == nil { - logger = logrus.New() - } - - var f LoggerFieldsFunc - if len(fieldsFunc) > 0 && fieldsFunc[0] != nil { - f = fieldsFunc[0] - } else { - f = func(c tele.Context) logrus.Fields { return nil } + logger = log.Default() } - return func(next tele.HandlerFunc) tele.HandlerFunc { return func(c tele.Context) error { - data := c.Data() - if clb := c.Callback(); clb != nil { - uniq := clb.Unique - if data == "" { - data = uniq - } else { - data = uniq + "|" + data - } - } else if data == "" { - data = c.Text() - } - - logger.WithFields(f(c)).Info(data) + data, _ := json.MarshalIndent(c.Update(), "", " ") + logger.Println(string(data)) return next(c) } } } - -func DefaultLogger() tele.MiddlewareFunc { - return Logger(logrus.New(), func(c tele.Context) logrus.Fields { - sender := c.Sender() - if sender == nil { - return nil - } - - return logrus.Fields{ - // Default set of fields - "sender": sender.Recipient(), - } - }) -}