vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Remove oom flag on daemon

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-01 11:17:29 -08:00
parent 17dc3f649c
commit 7cbe3e759d
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
containerd/main.go
View file

@ -62,7 +62,6 @@ func main() {
context.String("listen"), context.String("listen"),
context.String("state-dir"), context.String("state-dir"),
10, 10,
context.Bool("oom-notify"), // TODO Windows: Remove oom-notify
context.String("runtime"), context.String("runtime"),
); err != nil { ); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
@ -73,11 +72,11 @@ func main() {
} }
} }
func daemon(address, stateDir string, concurrency int, oom bool, runtimeName string) error { func daemon(address, stateDir string, concurrency int, runtimeName string) error {
// setup a standard reaper so that we don't leave any zombies if we are still alive // setup a standard reaper so that we don't leave any zombies if we are still alive
// this is just good practice because we are spawning new processes // this is just good practice because we are spawning new processes
go reapProcesses() go reapProcesses()
sv, err := supervisor.New(stateDir, oom, runtimeName) sv, err := supervisor.New(stateDir, runtimeName)
if err != nil { if err != nil {
return err return err
} }

4
containerd/main_linux.go
View file

@ -25,10 +25,6 @@ const (
) )
func appendPlatformFlags() { func appendPlatformFlags() {
daemonFlags = append(daemonFlags, cli.BoolFlag{
Name: "oom-notify",
Usage: "enable oom notifications for containers",
})
daemonFlags = append(daemonFlags, cli.StringFlag{ daemonFlags = append(daemonFlags, cli.StringFlag{
Name: "graphite-address", Name: "graphite-address",
Usage: "Address of graphite server", Usage: "Address of graphite server",

2
supervisor/supervisor.go
View file

@ -18,7 +18,7 @@ const (
) )
// New returns an initialized Process supervisor. // New returns an initialized Process supervisor.
func New(stateDir string, oom bool, runtimeName string) (*Supervisor, error) { func New(stateDir string, runtimeName string) (*Supervisor, error) {
startTasks := make(chan *startTask, 10) startTasks := make(chan *startTask, 10)
if err := os.MkdirAll(stateDir, 0755); err != nil { if err := os.MkdirAll(stateDir, 0755); err != nil {
return nil, err return nil, err