From 2110db6f0ca65b5f0cfb4c520110e8d667fb105e Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Tue, 27 Feb 2018 21:58:44 +0100
Subject: Add environment override back

---
 bridge/config/config.go | 4 +++-
 gateway/gateway.go      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bridge/config/config.go b/bridge/config/config.go
index 2a596cce..9e3f854e 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -225,7 +225,9 @@ func OverrideCfgFromEnv(cfg *Config, protocol string, account string) {
 				if res != "" {
 					fieldVal := protoStruct.Field(i)
 					if fieldVal.Kind() == reflect.String {
-						log.Printf("config: overriding %s from env with %s\n", key, res)
+						log.WithFields(log.Fields{
+							"prefix": "config",
+						}).Infof("overriding %s from env with %s\n", key, res)
 						fieldVal.Set(reflect.ValueOf(res))
 					}
 				}
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 581b638b..5b14d164 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -81,6 +81,8 @@ func (gw *Gateway) AddBridge(cfg *config.Bridge) error {
 	br := gw.Router.getBridge(cfg.Account)
 	if br == nil {
 		br = bridge.New(cfg)
+		// override config from environment
+		config.OverrideCfgFromEnv(gw.Config, br.Protocol, br.Name)
 		// set logging
 		br.Log = log.WithFields(log.Fields{"prefix": "bridge"})
 		// get the protocol configuration (eg irc)
-- 
cgit v1.2.3