Merge pull request #43702 from thaJeztah/daemon_event_simplify

daemon: LogDaemonEventWithAttributes: don't call SystemInfo()

daemon/events.go

@@ -87,14 +87,13 @@ func (daemon *Daemon) LogNetworkEventWithAttributes(nw libnetwork.Network, actio
 // LogDaemonEventWithAttributes generates an event related to the daemon itself with specific given attributes.
 func (daemon *Daemon) LogDaemonEventWithAttributes(action string, attributes map[string]string) {
 	if daemon.EventsService != nil {
-		if info := daemon.SystemInfo(); info.Name != "" {
-			attributes["name"] = info.Name
+		if name := hostName(); name != "" {
+			attributes["name"] = name
 		}
-		actor := events.Actor{
+		daemon.EventsService.Log(action, events.DaemonEventType, events.Actor{
 			ID:         daemon.id,
 			Attributes: attributes,
-		}
-		daemon.EventsService.Log(action, events.DaemonEventType, actor)
+		})
 	}
 }
 

daemon/reload.go

@@ -42,10 +42,6 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) {
 			})
 			logrus.Infof("Reloaded configuration: %s", jsonString)
 		}
-
-		// we're unlocking here, because
-		// LogDaemonEventWithAttributes() -> SystemInfo() -> GetAllRuntimes()
-		// holds that lock too.
 		daemon.configStore.Unlock()
 		if err == nil {
 			daemon.LogDaemonEventWithAttributes("reload", attributes)