diff --git a/bridge/api/api.go b/bridge/api/api.go index 15e73745..38951f2f 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -110,7 +110,7 @@ func (b *Api) handleConfigReload(c echo.Context) error { b.Log.Error("Error reading remote config file: ", err) return c.String(http.StatusInternalServerError, "Internal Server Error") } - cfgfile := b.GetConfigFile() + cfgfile := b.ConfigFileUsed() err = ioutil.WriteFile(cfgfile, content, 0644) if err != nil { b.Log.Error("Failed to write remote config file: ", err) diff --git a/bridge/bridge.go b/bridge/bridge.go index 25e448fe..74cb9d3f 100644 --- a/bridge/bridge.go +++ b/bridge/bridge.go @@ -68,8 +68,8 @@ func (b *Bridge) joinChannels(channels map[string]config.ChannelInfo, exists map return nil } -func (b *Bridge) GetConfigFile() string { - return b.Config.GetConfigFile() +func (b *Bridge) ConfigFileUsed() string { + return b.Config.ConfigFileUsed() } func (b *Bridge) GetBool(key string) bool { diff --git a/bridge/config/config.go b/bridge/config/config.go index 80e0d00d..a3abc3c4 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -173,7 +173,6 @@ type ConfigValues struct { General Protocol Gateway []Gateway SameChannelGateway []SameChannelGateway - ConfigFile string } type Config struct { @@ -234,8 +233,8 @@ func NewConfigFromString(input []byte) *Config { return mycfg } -func (c *Config) GetConfigFile() string { - return c.v.GetString("ConfigFile") +func (c *Config) ConfigFileUsed() string { + return c.v.ConfigFileUsed() } func (c *Config) GetBool(key string) bool {