diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container.go | 9 | ||||
| -rw-r--r-- | libpod/container_log.go (renamed from libpod/container.log.go) | 3 | ||||
| -rw-r--r-- | libpod/define/config.go | 9 | ||||
| -rw-r--r-- | libpod/oci_conmon_linux.go | 10 | ||||
| -rw-r--r-- | libpod/options.go | 2 | ||||
| -rw-r--r-- | libpod/pod_api.go | 49 | ||||
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
7 files changed, 40 insertions, 44 deletions
diff --git a/libpod/container.go b/libpod/container.go index a1848b96a..5cd719ab6 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -34,15 +34,6 @@ const SystemdDefaultCgroupParent = "machine.slice" // manager in libpod when running as rootless const SystemdDefaultRootlessCgroupParent = "user.slice" -// JournaldLogging is the string conmon expects to specify journald logging -const JournaldLogging = "journald" - -// KubernetesLogging is the string conmon expects when specifying to use the kubernetes logging format -const KubernetesLogging = "k8s-file" - -// JSONLogging is the string conmon expects when specifying to use the json logging format -const JSONLogging = "json-file" - // DefaultWaitInterval is the default interval between container status checks // while waiting. const DefaultWaitInterval = 250 * time.Millisecond diff --git a/libpod/container.log.go b/libpod/container_log.go index 514edb8c8..bfa303e84 100644 --- a/libpod/container.log.go +++ b/libpod/container_log.go @@ -3,6 +3,7 @@ package libpod import ( "os" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/logs" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -22,7 +23,7 @@ func (r *Runtime) Log(containers []*Container, options *logs.LogOptions, logChan func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogLine) error { // TODO Skip sending logs until journald logs can be read // TODO make this not a magic string - if c.LogDriver() == JournaldLogging { + if c.LogDriver() == define.JournaldLogging { return c.readFromJournal(options, logChannel) } return c.readFromLogFile(options, logChannel) diff --git a/libpod/define/config.go b/libpod/define/config.go index 10e00062a..17d764c65 100644 --- a/libpod/define/config.go +++ b/libpod/define/config.go @@ -57,3 +57,12 @@ type AttachStreams struct { // If false, stdout will not be attached AttachInput bool } + +// JournaldLogging is the string conmon expects to specify journald logging +const JournaldLogging = "journald" + +// KubernetesLogging is the string conmon expects when specifying to use the kubernetes logging format +const KubernetesLogging = "k8s-file" + +// JSONLogging is the string conmon expects when specifying to use the json logging format +const JSONLogging = "json-file" diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 0113f7d8e..da4b85067 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1427,9 +1427,9 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p var logDriver string switch ctr.LogDriver() { - case JournaldLogging: - logDriver = JournaldLogging - case JSONLogging: + case define.JournaldLogging: + logDriver = define.JournaldLogging + case define.JSONLogging: fallthrough default: //nolint-stylecheck // No case here should happen except JSONLogging, but keep this here in case the options are extended @@ -1439,8 +1439,8 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p // to get here, either a user would specify `--log-driver ""`, or this came from another place in libpod // since the former case is obscure, and the latter case isn't an error, let's silently fallthrough fallthrough - case KubernetesLogging: - logDriver = fmt.Sprintf("%s:%s", KubernetesLogging, logPath) + case define.KubernetesLogging: + logDriver = fmt.Sprintf("%s:%s", define.KubernetesLogging, logPath) } args = append(args, "-l", logDriver) diff --git a/libpod/options.go b/libpod/options.go index 65a089131..b4e436b63 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -985,7 +985,7 @@ func WithLogDriver(driver string) CtrCreateOption { switch driver { case "": return errors.Wrapf(define.ErrInvalidArg, "log driver must be set") - case JournaldLogging, KubernetesLogging, JSONLogging: + case define.JournaldLogging, define.KubernetesLogging, define.JSONLogging: break default: return errors.Wrapf(define.ErrInvalidArg, "invalid log driver") diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 200732652..ed4dc0727 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -431,9 +431,9 @@ func containerStatusFromContainers(allCtrs []*Container) (map[string]define.Cont } // Inspect returns a PodInspect struct to describe the pod -func (p *Pod) Inspect() (*PodInspect, error) { +func (p *Pod) Inspect() (*define.InspectPodData, error) { var ( - podContainers []PodContainerInfo + ctrs []define.InspectPodContainerInfo ) p.lock.Lock() @@ -444,14 +444,6 @@ func (p *Pod) Inspect() (*PodInspect, error) { containers, err := p.runtime.state.PodContainers(p) if err != nil { - return &PodInspect{}, err - } - ctrStatuses, err := containerStatusFromContainers(containers) - if err != nil { - return nil, err - } - status, err := CreatePodStatusResults(ctrStatuses) - if err != nil { return nil, err } for _, c := range containers { @@ -462,26 +454,29 @@ func (p *Pod) Inspect() (*PodInspect, error) { if err == nil { containerStatus = containerState.String() } - pc := PodContainerInfo{ + ctrs = append(ctrs, define.InspectPodContainerInfo{ ID: c.ID(), + Name: c.Name(), State: containerStatus, - } - podContainers = append(podContainers, pc) + }) + } + inspectData := define.InspectPodData{ + ID: p.ID(), + Name: p.Name(), + Namespace: p.Namespace(), + Created: p.CreatedTime(), + Hostname: "", + Labels: p.Labels(), + CreateCgroup: false, + CgroupParent: p.CgroupParent(), + CgroupPath: p.state.CgroupPath, + CreateInfra: false, + InfraContainerID: p.state.InfraContainerID, + InfraConfig: nil, + SharedNamespaces: nil, + NumContainers: uint(len(containers)), + Containers: ctrs, } - infraContainerID := p.state.InfraContainerID - config := new(PodConfig) - if err := JSONDeepCopy(p.config, config); err != nil { - return nil, err - } - inspectData := PodInspect{ - Config: config, - State: &PodInspectState{ - CgroupPath: p.state.CgroupPath, - InfraContainerID: infraContainerID, - Status: status, - }, - Containers: podContainers, - } return &inspectData, nil } diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 9d3e69d56..3dc8d3d0f 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -321,7 +321,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai ctrNamedVolumes = append(ctrNamedVolumes, newVol) } - if ctr.config.LogPath == "" && ctr.config.LogDriver != JournaldLogging { + if ctr.config.LogPath == "" && ctr.config.LogDriver != define.JournaldLogging { ctr.config.LogPath = filepath.Join(ctr.config.StaticDir, "ctr.log") } |