From e92b6de09fd9d983deea17113b28aaba14863735 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Tue, 20 Feb 2018 23:36:29 +0100
Subject: [PATCH] Add more debug

---
 bridge/bridge.go | 2 +-
 matterbridge.go  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bridge/bridge.go b/bridge/bridge.go
index 8c88305c..a57eedbd 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -100,7 +100,7 @@ func (b *Bridge) JoinChannels() error {
 func (b *Bridge) joinChannels(channels map[string]config.ChannelInfo, exists map[string]bool) error {
 	for ID, channel := range channels {
 		if !exists[ID] {
-			log.Infof("%s: joining %s (%s)", b.Account, channel.Name, ID)
+			log.Infof("%s: joining %s (ID: %s)", b.Account, channel.Name, ID)
 			err := b.JoinChannel(channel)
 			if err != nil {
 				return err
diff --git a/matterbridge.go b/matterbridge.go
index 0864822b..eb96d4d7 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -16,11 +16,8 @@ var (
 	githash string
 )
 
-func init() {
-	log.SetFormatter(&log.TextFormatter{FullTimestamp: true})
-}
-
 func main() {
+	log.SetFormatter(&log.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")
@@ -35,6 +32,7 @@ func main() {
 		return
 	}
 	if *flagDebug || os.Getenv("DEBUG") == "1" {
+		log.SetFormatter(&log.TextFormatter{FullTimestamp: false})
 		log.Info("Enabling debug")
 		log.SetLevel(log.DebugLevel)
 	}