Add logging for started supervisor
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
parent
d9e8fe62cb
commit
9f5caf529c
4 changed files with 13 additions and 0 deletions
|
@ -343,6 +343,10 @@ type libcontainerRuntime struct {
|
||||||
factory libcontainer.Factory
|
factory libcontainer.Factory
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *libcontainerRuntime) Type() string {
|
||||||
|
return "libcontainer"
|
||||||
|
}
|
||||||
|
|
||||||
func (r *libcontainerRuntime) Create(id, bundlePath string, stdio *runtime.Stdio) (runtime.Container, error) {
|
func (r *libcontainerRuntime) Create(id, bundlePath string, stdio *runtime.Stdio) (runtime.Container, error) {
|
||||||
spec, rspec, err := r.loadSpec(
|
spec, rspec, err := r.loadSpec(
|
||||||
filepath.Join(bundlePath, "config.json"),
|
filepath.Join(bundlePath, "config.json"),
|
||||||
|
|
|
@ -135,6 +135,10 @@ type runcRuntime struct {
|
||||||
stateDir string
|
stateDir string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *runcRuntime) Type() string {
|
||||||
|
return "runc"
|
||||||
|
}
|
||||||
|
|
||||||
func (r *runcRuntime) Create(id, bundlePath string, stdio *runtime.Stdio) (runtime.Container, error) {
|
func (r *runcRuntime) Create(id, bundlePath string, stdio *runtime.Stdio) (runtime.Container, error) {
|
||||||
cmd := exec.Command("runc", "--root", r.stateDir, "--id", id, "start")
|
cmd := exec.Command("runc", "--root", r.stateDir, "--id", id, "start")
|
||||||
cmd.Dir = bundlePath
|
cmd.Dir = bundlePath
|
||||||
|
|
|
@ -17,4 +17,5 @@ var (
|
||||||
type Runtime interface {
|
type Runtime interface {
|
||||||
Create(id, bundlePath string, stdio *Stdio) (Container, error)
|
Create(id, bundlePath string, stdio *Stdio) (Container, error)
|
||||||
StartProcess(Container, specs.Process, *Stdio) (Process, error)
|
StartProcess(Container, specs.Process, *Stdio) (Process, error)
|
||||||
|
Type() string
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,6 +149,10 @@ func (s *Supervisor) Start() error {
|
||||||
close(e.Err)
|
close(e.Err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"runtime": s.runtime.Type(),
|
||||||
|
"stateDir": s.stateDir,
|
||||||
|
}).Debug("Supervisor started")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue