rani/matterbridge.git

commit 23c5faadef06a372ad07fe7f20796d9569fbe515 Author: Wim <wim@42.be> Date: Tue Feb 20 23:41:09 2018 +0000 Move Sirupsen => sirupsen diff --git a/bridge/api/api.go b/bridge/api/api.go index 2fd7feb..6055cd5 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -37 +37 @@ package api  import (   "encoding/json"   "github.com/42wim/matterbridge/bridge/config" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/labstack/echo"   "github.com/labstack/echo/middleware"   "github.com/zfjagann/golang-ring" diff --git a/bridge/bridge.go b/bridge/bridge.go index a57eedb..0a2bfed 100644 --- a/bridge/bridge.go +++ b/bridge/bridge.go @@ -147 +147 @@ import (   "github.com/42wim/matterbridge/bridge/steam"   "github.com/42wim/matterbridge/bridge/telegram"   "github.com/42wim/matterbridge/bridge/xmpp" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"     "strings"  ) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 41a07fc..70e11e0 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -47 +47 @@ import (   "bytes"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/bwmarrin/discordgo"   "regexp"   "strings" diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go index 0d41c77..9f988f5 100644 --- a/bridge/gitter/gitter.go +++ b/bridge/gitter/gitter.go @@ -57 +57 @@ import (   "github.com/42wim/go-gitter"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "strings"  )   diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index d95aef4..d7b45b7 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -67 +67 @@ import (   "fmt"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/lrstanley/girc"   "github.com/paulrosania/go-charset/charset"   _ "github.com/paulrosania/go-charset/data" diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 0be7fc9..d0b435e 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -97 +97 @@ import (     "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   matrix "github.com/matterbridge/gomatrix"  )   diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index e60a136..2b93b9b 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -77 +77 @@ import (   "github.com/42wim/matterbridge/bridge/helper"   "github.com/42wim/matterbridge/matterclient"   "github.com/42wim/matterbridge/matterhook" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "strings"  )   diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go index 0164612..893cea7 100644 --- a/bridge/rocketchat/rocketchat.go +++ b/bridge/rocketchat/rocketchat.go @@ -57 +57 @@ import (   "github.com/42wim/matterbridge/bridge/helper"   "github.com/42wim/matterbridge/hook/rockethook"   "github.com/42wim/matterbridge/matterhook" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"  )    type MMhook struct { diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 1aca762..fa49da9 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -77 +77 @@ import (   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper"   "github.com/42wim/matterbridge/matterhook" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/nlopes/slack"   "html"   "io" diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go index e25cdbd..4b91df0 100644 --- a/bridge/sshchat/sshchat.go +++ b/bridge/sshchat/sshchat.go @@ -47 +47 @@ import (   "bufio"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/shazow/ssh-chat/sshd"   "io"   "strings" diff --git a/bridge/steam/steam.go b/bridge/steam/steam.go index 51e15c5..2ce6e0b 100644 --- a/bridge/steam/steam.go +++ b/bridge/steam/steam.go @@ -67 +67 @@ import (   "github.com/Philipp15b/go-steam"   "github.com/Philipp15b/go-steam/protocol/steamlang"   "github.com/Philipp15b/go-steam/steamid" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   //"io/ioutil"   "strconv"   "sync" diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go index 25fa39e..6385357 100644 --- a/bridge/telegram/telegram.go +++ b/bridge/telegram/telegram.go @@ -77 +77 @@ import (     "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/go-telegram-bot-api/telegram-bot-api"  )   diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 1f18f74..c2f63e7 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -47 +47 @@ import (   "crypto/tls"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   "github.com/jpillora/backoff"   "github.com/mattn/go-xmpp"   diff --git a/gateway/gateway.go b/gateway/gateway.go index c70fbb0..27f6ffc 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -57 +57 @@ import (   "fmt"   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   // "github.com/davecgh/go-spew/spew"   "crypto/sha1"   "github.com/hashicorp/golang-lru" diff --git a/gateway/router.go b/gateway/router.go index 192fa9a..e1944d4 100644 --- a/gateway/router.go +++ b/gateway/router.go @@ -57 +57 @@ import (   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/gateway/samechannel" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"   // "github.com/davecgh/go-spew/spew"   "time"  ) @@ -426 +427 @@ func NewRouter(cfg *config.Config) (*Router, error) {  func (r *Router) Start() error {   m := make(map[string]*bridge.Bridge)   for _, gw := range r.Gateways { + log.Infof("Parsing gateway %s", gw.Name)   for _, br := range gw.Bridges {   m[br.Account] = br   } diff --git a/matterbridge.go b/matterbridge.go index eb96d4d..0691a1f 100644 --- a/matterbridge.go +++ b/matterbridge.go @@ -58 +59 @@ import (   "fmt"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/gateway" - log "github.com/Sirupsen/logrus"   "github.com/google/gops/agent" + log "github.com/sirupsen/logrus" + prefixed "github.com/x-cray/logrus-prefixed-formatter"   "os"   "strings"  ) @@ -177 +187 @@ var (  )    func main() { - log.SetFormatter(&log.TextFormatter{FullTimestamp: true}) + log.SetFormatter(&prefixed.TextFormatter{FullTimestamp: true})   flagConfig := flag.String("conf", "matterbridge.toml", "config file")   flagDebug := flag.Bool("debug", false, "enable debug")   flagVersion := flag.Bool("version", false, "show version") @@ -327 +337 @@ func main() {   return   }   if *flagDebug || os.Getenv("DEBUG") == "1" { - log.SetFormatter(&log.TextFormatter{FullTimestamp: false}) + log.SetFormatter(&prefixed.TextFormatter{FullTimestamp: false})   log.Info("Enabling debug")   log.SetLevel(log.DebugLevel)   } diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index 8d9f6a3..9e44705 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -137 +137 @@ import (   "sync"   "time"   - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus"     "github.com/gorilla/websocket"   "github.com/hashicorp/golang-lru"