beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: SystemInfo() extract container counts to a helper function

Browse source 
This makes it more inline with other data we collect, and can be used to
make some info optional at some point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-02-15 19:19:30 +01:00
parent e8a0a545e7
commit a27f8aecad
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
daemon/info.go
View file

@ -30,14 +30,9 @@ func (daemon *Daemon) SystemInfo() *types.Info {
defer metrics.StartTimer(hostInfoFunctions.WithValues("system_info"))() defer metrics.StartTimer(hostInfoFunctions.WithValues("system_info"))()
sysInfo := daemon.RawSysInfo() sysInfo := daemon.RawSysInfo()
cRunning, cPaused, cStopped := stateCtr.get()
v := &types.Info{ v := &types.Info{
ID: daemon.ID, ID: daemon.ID,
Containers: cRunning + cPaused + cStopped,
ContainersRunning: cRunning,
ContainersPaused: cPaused,
ContainersStopped: cStopped,
Images: daemon.imageService.CountImages(), Images: daemon.imageService.CountImages(),
IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled, IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled,
BridgeNfIptables: !sysInfo.BridgeNFCallIPTablesDisabled, BridgeNfIptables: !sysInfo.BridgeNFCallIPTablesDisabled,
@ -70,6 +65,7 @@ func (daemon *Daemon) SystemInfo() *types.Info {
Isolation: daemon.defaultIsolation, Isolation: daemon.defaultIsolation,
} }
daemon.fillContainerStates(v)
daemon.fillAPIInfo(v) daemon.fillAPIInfo(v)
// Retrieve platform specific info // Retrieve platform specific info
daemon.fillPlatformInfo(v, sysInfo) daemon.fillPlatformInfo(v, sysInfo)
@ -181,6 +177,14 @@ func (daemon *Daemon) fillSecurityOptions(v *types.Info, sysInfo *sysinfo.SysInf
v.SecurityOptions = securityOptions v.SecurityOptions = securityOptions
} }
func (daemon *Daemon) fillContainerStates(v *types.Info) {
cRunning, cPaused, cStopped := stateCtr.get()
v.Containers = cRunning + cPaused + cStopped
v.ContainersPaused = cPaused
v.ContainersRunning = cRunning
v.ContainersStopped = cStopped
}
func (daemon *Daemon) fillAPIInfo(v *types.Info) { func (daemon *Daemon) fillAPIInfo(v *types.Info) {
const warn string = ` const warn string = `
Access to the remote API is equivalent to root access on the host. Refer Access to the remote API is equivalent to root access on the host. Refer