diff --git a/components/engine/daemon/config/config.go b/components/engine/daemon/config/config.go index e3ed530028..1466c0b71b 100644 --- a/components/engine/daemon/config/config.go +++ b/components/engine/daemon/config/config.go @@ -167,7 +167,7 @@ type CommonConfig struct { sync.Mutex // FIXME(vdemeester) This part is not that clear and is mainly dependent on cli flags // It should probably be handled outside this package. - ValuesSet map[string]interface{} + ValuesSet map[string]interface{} `json:"-"` Experimental bool `json:"experimental"` // Experimental indicates whether experimental features should be exposed or not diff --git a/components/engine/daemon/reload.go b/components/engine/daemon/reload.go index 0bbda29234..5a73c9ef92 100644 --- a/components/engine/daemon/reload.go +++ b/components/engine/daemon/reload.go @@ -27,11 +27,14 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) { attributes := map[string]string{} defer func() { + jsonString, _ := json.Marshal(daemon.configStore) + // we're unlocking here, because // LogDaemonEventWithAttributes() -> SystemInfo() -> GetAllRuntimes() // holds that lock too. daemon.configStore.Unlock() if err == nil { + logrus.Infof("Reloaded configuration: %s", jsonString) daemon.LogDaemonEventWithAttributes("reload", attributes) } }()