diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 11:23:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 11:23:23 +0000 |
| commit | f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1 (patch) | |
| tree | 1f6ce5bd3831bf29432305a12f85d6ed6004f630 /libpod | |
| parent | 8333a9ee90078dd8cf1194f1df59bae70709bdf1 (diff) | |
| parent | e42d920ebfa381322eb03cb27941ecb93eea3dd7 (diff) | |
| download | podman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.tar.gz podman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.tar.bz2 podman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.zip | |
Merge pull request #8730 from rhatdan/log
Add LogSize to container inspect
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 7 | ||||
| -rw-r--r-- | libpod/define/container_inspect.go | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 2ce3e8e68..51474471b 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -8,6 +8,7 @@ import ( "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/libpod/driver" "github.com/containers/podman/v2/pkg/util" + units "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/validate" @@ -124,8 +125,6 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) HostnamePath: hostnamePath, HostsPath: hostsPath, StaticDir: config.StaticDir, - LogPath: config.LogPath, - LogTag: config.LogTag, OCIRuntime: config.OCIRuntime, ConmonPidFile: config.ConmonPidFile, Name: config.Name, @@ -354,6 +353,10 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named logConfig := new(define.InspectLogConfig) logConfig.Type = c.config.LogDriver + logConfig.Path = c.config.LogPath + logConfig.Size = units.HumanSize(float64(c.config.LogSize)) + logConfig.Tag = c.config.LogTag + hostConfig.LogConfig = logConfig restartPolicy := new(define.InspectRestartPolicy) diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 775965477..c15bcedf2 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -82,10 +82,15 @@ type InspectRestartPolicy struct { } // InspectLogConfig holds information about a container's configured log driver -// and is presently unused. It is retained for Docker compatibility. type InspectLogConfig struct { Type string `json:"Type"` Config map[string]string `json:"Config"` //idk type, TODO + // Path specifies a path to the log file + Path string `json:"Path"` + // Tag specifies a custom log tag for the container + Tag string `json:"Tag"` + // Size specifies a maximum size of the container log + Size string `json:"Size"` } // InspectBlkioWeightDevice holds information about the relative weight @@ -620,8 +625,6 @@ type InspectContainerData struct { StaticDir string `json:"StaticDir"` OCIConfigPath string `json:"OCIConfigPath,omitempty"` OCIRuntime string `json:"OCIRuntime,omitempty"` - LogPath string `json:"LogPath"` - LogTag string `json:"LogTag"` ConmonPidFile string `json:"ConmonPidFile"` Name string `json:"Name"` RestartCount int32 `json:"RestartCount"` |