kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

docker info show logging driver info

Browse source 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
This commit is contained in:
Deng Guangxing 2015-04-01 09:58:07 +08:00
parent 98cfa2aecd
commit f5a401d3fe
6 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/client/info.go
View file

@ -57,6 +57,9 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
if remoteInfo.Exists("ExecutionDriver") { if remoteInfo.Exists("ExecutionDriver") {
fmt.Fprintf(cli.out, "Execution Driver: %s\n", remoteInfo.Get("ExecutionDriver")) fmt.Fprintf(cli.out, "Execution Driver: %s\n", remoteInfo.Get("ExecutionDriver"))
} }
if remoteInfo.Exists("LoggingDriver") {
fmt.Fprintf(cli.out, "Logging Driver: %s\n", remoteInfo.Get("LoggingDriver"))
}
if remoteInfo.Exists("KernelVersion") { if remoteInfo.Exists("KernelVersion") {
fmt.Fprintf(cli.out, "Kernel Version: %s\n", remoteInfo.Get("KernelVersion")) fmt.Fprintf(cli.out, "Kernel Version: %s\n", remoteInfo.Get("KernelVersion"))
} }

1
daemon/info.go
View file

@ -79,6 +79,7 @@ func (daemon *Daemon) CmdInfo(job *engine.Job) error {
v.SetInt("NGoroutines", runtime.NumGoroutine()) v.SetInt("NGoroutines", runtime.NumGoroutine())
v.Set("SystemTime", time.Now().Format(time.RFC3339Nano)) v.Set("SystemTime", time.Now().Format(time.RFC3339Nano))
v.Set("ExecutionDriver", daemon.ExecutionDriver().Name()) v.Set("ExecutionDriver", daemon.ExecutionDriver().Name())
v.Set("LoggingDriver", daemon.defaultLogConfig.Type)
v.SetInt("NEventsListener", env.GetInt("count")) v.SetInt("NEventsListener", env.GetInt("count"))
v.Set("KernelVersion", kernelVersion) v.Set("KernelVersion", kernelVersion)
v.Set("OperatingSystem", operatingSystem) v.Set("OperatingSystem", operatingSystem)

1
docs/man/docker-info.1.md
View file

@ -37,6 +37,7 @@ Here is a sample output:
Root Dir: /var/lib/docker/aufs Root Dir: /var/lib/docker/aufs
Dirs: 80 Dirs: 80
Execution Driver: native-0.2 Execution Driver: native-0.2
Logging Driver: json-file
Kernel Version: 3.13.0-24-generic Kernel Version: 3.13.0-24-generic
Operating System: Ubuntu 14.04 LTS Operating System: Ubuntu 14.04 LTS
CPUs: 1 CPUs: 1

1
docs/sources/reference/commandline/cli.md
View file

@ -1332,6 +1332,7 @@ For example:
Backing Filesystem: extfs Backing Filesystem: extfs
Dirs: 545 Dirs: 545
Execution Driver: native-0.2 Execution Driver: native-0.2
Logging Driver: json-file
Kernel Version: 3.13.0-24-generic Kernel Version: 3.13.0-24-generic
Operating System: Ubuntu 14.04 LTS Operating System: Ubuntu 14.04 LTS
CPUs: 1 CPUs: 1

1
docs/sources/userguide/labels-custom-metadata.md
View file

@ -171,6 +171,7 @@ These labels appear as part of the `docker info` output for the daemon:
Backing Filesystem: extfs Backing Filesystem: extfs
Dirs: 697 Dirs: 697
Execution Driver: native-0.2 Execution Driver: native-0.2
Logging Driver: json-file
Kernel Version: 3.13.0-32-generic Kernel Version: 3.13.0-32-generic
Operating System: Ubuntu 14.04.1 LTS Operating System: Ubuntu 14.04.1 LTS
CPUs: 1 CPUs: 1

2
integration-cli/docker_cli_info_test.go
View file

@ -14,7 +14,7 @@ func TestInfoEnsureSucceeds(t *testing.T) {
t.Fatalf("failed to execute docker info: %s, %v", out, err) t.Fatalf("failed to execute docker info: %s, %v", out, err)
} }
stringsToCheck := []string{"Containers:", "Execution Driver:", "Kernel Version:"} stringsToCheck := []string{"Containers:", "Execution Driver:", "Logging Driver:", "Kernel Version:"}
for _, linePrefix := range stringsToCheck { for _, linePrefix := range stringsToCheck {
if !strings.Contains(out, linePrefix) { if !strings.Contains(out, linePrefix) {