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

Merge pull request #11757 from ankushagarwal/Fds

Rename 'Fds' to 'File Descriptors' in docker info
This commit is contained in:
Arnaud Porterie 2015-03-25 16:24:57 -07:00
commit e589dc7424
4 changed files with 5 additions and 5 deletions

View file

@ -81,7 +81,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
} }
fmt.Fprintf(cli.out, "Debug mode (client): %v\n", os.Getenv("DEBUG") != "") fmt.Fprintf(cli.out, "Debug mode (client): %v\n", os.Getenv("DEBUG") != "")
if remoteInfo.Exists("NFd") { if remoteInfo.Exists("NFd") {
fmt.Fprintf(cli.out, "Fds: %d\n", remoteInfo.GetInt("NFd")) fmt.Fprintf(cli.out, "File Descriptors: %d\n", remoteInfo.GetInt("NFd"))
} }
if remoteInfo.Exists("NGoroutines") { if remoteInfo.Exists("NGoroutines") {
fmt.Fprintf(cli.out, "Goroutines: %d\n", remoteInfo.GetInt("NGoroutines")) fmt.Fprintf(cli.out, "Goroutines: %d\n", remoteInfo.GetInt("NGoroutines"))

View file

@ -1333,7 +1333,7 @@ For example:
Total Memory: 2 GiB Total Memory: 2 GiB
Debug mode (server): false Debug mode (server): false
Debug mode (client): true Debug mode (client): true
Fds: 10 File Descriptors: 10
Goroutines: 9 Goroutines: 9
System Time: Tue Mar 10 18:38:57 UTC 2015 System Time: Tue Mar 10 18:38:57 UTC 2015
EventsListeners: 0 EventsListeners: 0

View file

@ -179,7 +179,7 @@ These labels appear as part of the `docker info` output for the daemon:
ID: RC3P:JTCT:32YS:XYSB:YUBG:VFED:AAJZ:W3YW:76XO:D7NN:TEVU:UCRW ID: RC3P:JTCT:32YS:XYSB:YUBG:VFED:AAJZ:W3YW:76XO:D7NN:TEVU:UCRW
Debug mode (server): false Debug mode (server): false
Debug mode (client): true Debug mode (client): true
Fds: 11 File Descriptors: 11
Goroutines: 14 Goroutines: 14
EventsListeners: 0 EventsListeners: 0
Init Path: /usr/bin/docker Init Path: /usr/bin/docker

View file

@ -7,11 +7,11 @@ import (
) )
func displayFdGoroutines(t *testing.T) { func displayFdGoroutines(t *testing.T) {
t.Logf("Fds: %d, Goroutines: %d", utils.GetTotalUsedFds(), runtime.NumGoroutine()) t.Logf("File Descriptors: %d, Goroutines: %d", utils.GetTotalUsedFds(), runtime.NumGoroutine())
} }
func TestFinal(t *testing.T) { func TestFinal(t *testing.T) {
nuke(globalDaemon) nuke(globalDaemon)
t.Logf("Start Fds: %d, Start Goroutines: %d", startFds, startGoroutines) t.Logf("Start File Descriptors: %d, Start Goroutines: %d", startFds, startGoroutines)
displayFdGoroutines(t) displayFdGoroutines(t)
} }