commit ad6523ab4591a2085918d18e293011351eb8f5d1
Author: Wim <wim@42.be>
Date: Tue Feb 27 21:58:44 2018 +0000
Add environment override back
diff --git a/bridge/config/config.go b/bridge/config/config.go
index 2a596cc..9e3f854 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -2257 +2259 @@ 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 581b638..5b14d16 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -816 +818 @@ 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)
