Fix build errors

This commit is contained in:
Michael Crosby 2015-11-05 15:49:13 -08:00
parent 15a96783ca
commit 05683fb0ee
7 changed files with 176 additions and 39 deletions

View file

@ -26,11 +26,14 @@ var DaemonCommand = cli.Command{
},
},
Action: func(context *cli.Context) {
if err := daemon(context.String("state-dir"), 20, context.Int("buffer-size")); err != nil {
logrus.Fatal(err)
}
},
}
func daemon(stateDir string, bufferSize int) error {
supervisor, err := container.NewSupervisor(stateDir)
func daemon(stateDir string, concurrency, bufferSize int) error {
supervisor, err := containerd.NewSupervisor(stateDir, concurrency)
if err != nil {
return err
}
@ -55,9 +58,7 @@ func startSignalHandler(supervisor *containerd.Supervisor, bufferSize int) {
logrus.WithField("error", err).Error("containerd: reaping child processes")
}
for _, e := range exits {
if err := supervisor.Process(e); err != nil {
logrus.WithField("error", err).Error("containerd: processing events")
}
supervisor.SendEvent(e)
}
}
}
@ -79,7 +80,7 @@ func reap() (exits []*containerd.ExitEvent, err error) {
if pid <= 0 {
return exits, nil
}
exits = append(exits, *conatinerd.ExitEvent{
exits = append(exits, &containerd.ExitEvent{
Pid: pid,
Status: utils.ExitStatus(ws),
})

View file

@ -18,12 +18,23 @@ func main() {
app.Version = Version
app.Usage = Usage
app.Authors = []cli.Author{
Name: "@crosbymichael",
Email: "crosbymichael@gmail.com",
{
Name: "@crosbymichael",
Email: "crosbymichael@gmail.com",
},
}
app.Commands = []cli.Command{
DaemonCommand,
}
app.Flags = []cli.Flag{
cli.BoolFlag{Name: "debug", Usage: "enable debug output in the logs"},
}
app.Before = func(context *cli.Context) error {
if context.GlobalBool("debug") {
logrus.SetLevel(logrus.DebugLevel)
}
return nil
}
if err := app.Run(os.Args); err != nil {
logrus.Fatal(err)
}