Merge pull request #2019 from aledbf/restart_app_on-failure

Gabriel Monroy · Gabriel Monroy · commit 1874823f2fe2 · 2014-10-06T09:46:07.000-06:00
feat(controller): restart the app if there is a failure.
diff --git a/controller/scheduler/coreos.py b/controller/scheduler/coreos.py
@@ -304,6 +304,8 @@ def attach(self, name):
     {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' $IMAGE | cut -d/ -f1) ; docker run --name {name} {memory} {cpu} -P -e PORT=$port $IMAGE {command}"'''},  # noqa
     {"section": "Service", "name": "ExecStop", "value": '''/usr/bin/docker rm -f {name}'''},
     {"section": "Service", "name": "TimeoutStartSec", "value": "20m"},
+    {"section": "Service", "name": "RestartSec", "value": "5"},
+    {"section": "Service", "name": "Restart", "value": "on-failure"},
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,8 @@ def attach(self, name):`
`304`	`304`	`{"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' $IMAGE \| cut -d/ -f1) ; docker run --name {name} {memory} {cpu} -P -e PORT=$port $IMAGE {command}"'''}, # noqa`
`305`	`305`	`{"section": "Service", "name": "ExecStop", "value": '''/usr/bin/docker rm -f {name}'''},`
`306`	`306`	`{"section": "Service", "name": "TimeoutStartSec", "value": "20m"},`
	`307`	`+ {"section": "Service", "name": "RestartSec", "value": "5"},`
	`308`	`+ {"section": "Service", "name": "Restart", "value": "on-failure"},`
`307`	`309`	`]`
`308`	`310`
`309`	`311`