From 189aaf8aea953c591f36ac340ad96def1131e869 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Sun, 24 Jul 2016 13:00:15 -0700 Subject: [PATCH] Add live-restore state to docker info output Signed-off-by: Kenfe-Mickael Laventure --- api/client/system/info.go | 3 +++ daemon/info.go | 1 + integration-cli/docker_cli_info_test.go | 1 + 3 files changed, 5 insertions(+) diff --git a/api/client/system/info.go b/api/client/system/info.go index ee3dbe88a6..f89a1b387a 100644 --- a/api/client/system/info.go +++ b/api/client/system/info.go @@ -212,5 +212,8 @@ func runInfo(dockerCli *client.DockerCli) error { fmt.Fprintf(dockerCli.Out(), " %s/%d\n", registry.IP.String(), mask) } } + + fmt.Fprintf(dockerCli.Out(), "Live Restore Enabled: %v\n", info.LiveRestoreEnabled) + return nil } diff --git a/daemon/info.go b/daemon/info.go index c42dae06dd..0c1987918c 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -117,6 +117,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { HTTPSProxy: sockets.GetProxyEnv("https_proxy"), NoProxy: sockets.GetProxyEnv("no_proxy"), SecurityOptions: securityOptions, + LiveRestoreEnabled: daemon.configStore.LiveRestoreEnabled, } // TODO Windows. Refactor this more once sysinfo is refactored into diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go index a48e69aa3f..628cb51313 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -33,6 +33,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) { "Volume:", "Network:", "Security Options:", + "Live Restore Enabled:", } if DaemonIsLinux.Condition() {