diff options
| -rw-r--r-- | bridge/mattermost/mattermost.go | 3 | ||||
| -rw-r--r-- | matterbridge.go | 4 | ||||
| -rw-r--r-- | matterclient/matterclient.go | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index bd1292bb..f6206493 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -364,6 +364,9 @@ func (b *Bmattermost) apiLogin() error { b.mc = matterclient.New(b.Config.Login, password, b.Config.Team, b.Config.Server) + if b.General.Debug { + b.mc.SetLogLevel("debug") + } b.mc.SkipTLSVerify = b.Config.SkipTLSVerify b.mc.NoTLS = b.Config.NoTLS flog.Infof("Connecting %s (team: %s) on %s", b.Config.Login, b.Config.Team, b.Config.Server) diff --git a/matterbridge.go b/matterbridge.go index 5e1e3f46..aa92bf08 100644 --- a/matterbridge.go +++ b/matterbridge.go @@ -18,7 +18,7 @@ var ( ) func main() { - log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 10, DisableColors: true, FullTimestamp: true}) + log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true, FullTimestamp: true}) flog := log.WithFields(log.Fields{"prefix": "main"}) flagConfig := flag.String("conf", "matterbridge.toml", "config file") flagDebug := flag.Bool("debug", false, "enable debug") @@ -34,7 +34,7 @@ func main() { return } if *flagDebug || os.Getenv("DEBUG") == "1" { - log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 10, DisableColors: true, FullTimestamp: false}) + log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true, FullTimestamp: false}) flog.Info("Enabling debug") log.SetLevel(log.DebugLevel) } diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index 9e44705d..27e96163 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -14,6 +14,7 @@ import ( "time" log "github.com/sirupsen/logrus" + prefixed "github.com/x-cray/logrus-prefixed-formatter" "github.com/gorilla/websocket" "github.com/hashicorp/golang-lru" @@ -73,12 +74,16 @@ type MMClient struct { func New(login, pass, team, server string) *MMClient { cred := &Credentials{Login: login, Pass: pass, Team: team, Server: server} mmclient := &MMClient{Credentials: cred, MessageChan: make(chan *Message, 100), Users: make(map[string]*model.User)} - mmclient.log = log.WithFields(log.Fields{"module": "matterclient"}) - log.SetFormatter(&log.TextFormatter{FullTimestamp: true}) + log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true}) + mmclient.log = log.WithFields(log.Fields{"prefix": "matterclient"}) mmclient.lruCache, _ = lru.New(500) return mmclient } +func (m *MMClient) SetDebugLog() { + log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true, FullTimestamp: false}) +} + func (m *MMClient) SetLogLevel(level string) { l, err := log.ParseLevel(level) if err != nil { |