commit 00be2d485c7be0891b43664c44a85459d6fb956a
Author: Wim <wim@42.be>
Date: Tue Feb 20 23:36:29 2018 +0000
diff --git a/bridge/bridge.go b/bridge/bridge.go
index 8c88305..a57eedb 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -1007 +1007 @@ 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 0864822..eb96d4d 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -1611 +168 @@ 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")
@@ -356 +327 @@ func main() {
return
}
if *flagDebug || os.Getenv("DEBUG") == "1" {
+ log.SetFormatter(&log.TextFormatter{FullTimestamp: false})
log.Info("Enabling debug")
log.SetLevel(log.DebugLevel)
}