Browse code

Add live-restore state to daemon reload event

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

Kenfe-Mickael Laventure authored on 2016/07/25 05:02:45
Showing 2 changed files
... ...
@@ -951,6 +951,7 @@ func (daemon *Daemon) Reload(config *Config) error {
951 951
 
952 952
 	// We emit daemon reload event here with updatable configurations
953 953
 	attributes["debug"] = fmt.Sprintf("%t", daemon.configStore.Debug)
954
+	attributes["live-restore"] = fmt.Sprintf("%t", daemon.configStore.LiveRestoreEnabled)
954 955
 	attributes["cluster-store"] = daemon.configStore.ClusterStore
955 956
 	if daemon.configStore.ClusterOpts != nil {
956 957
 		opts, _ := json.Marshal(daemon.configStore.ClusterOpts)
... ...
@@ -437,7 +437,7 @@ func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) {
437 437
 	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c))
438 438
 	c.Assert(err, checker.IsNil)
439 439
 
440
-	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s (cluster-advertise=, cluster-store=, cluster-store-opts={}, debug=true, default-runtime=runc, labels=[\"bar=foo\"], max-concurrent-downloads=1, max-concurrent-uploads=5, name=%s, runtimes=runc:{docker-runc []})", daemonID, daemonName))
440
+	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s (cluster-advertise=, cluster-store=, cluster-store-opts={}, debug=true, default-runtime=runc, labels=[\"bar=foo\"], live-restore=false, max-concurrent-downloads=1, max-concurrent-uploads=5, name=%s, runtimes=runc:{docker-runc []})", daemonID, daemonName))
441 441
 }
442 442
 
443 443
 func (s *DockerDaemonSuite) TestDaemonEventsWithFilters(c *check.C) {