Merge lp:~roadmr/charms/xenial/gunicorn/restart-harder into lp:~ubuntuone-hackers/charms/xenial/gunicorn/trunk

[Daniel Manrique]

Add restart_on_failure setting to restart on failure :)

This applies only to systemd configuration and can be managed via a juju setting. Upstart config is obsolete at this point but it already had (non-controllable) respawn behavior so this looks like just fixing a regression.

Add restart_on_failure setting to restart on failure :)

This applies only to systemd configuration and can be managed via a juju setting. Upstart config is obsolete at this point but it already had (non-controllable) respawn behavior so this looks like just fixing a regression.

[lp:~roadmr/charms/xenial/gunicorn/restart-harder]

46. By Daniel Manrique on 2020-03-20

It's the booleans

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-10-10 13:07:21 +0000
+++ config.yaml	2020-03-20 19:41:15 +0000
@@ -113,3 +113,10 @@
         description: >
             Path to gunicorn. Defaults to system.
             Use if run in venv.
+    restart_on_failure:
+        type: boolean
+        default: false
+        description: >
+            If true, the systemd service will restart after 30 seconds
+            if it exits abnormally (see Restart= on-failure in
+            systemd.service man page)

=== modified file 'templates/systemd.tmpl'
--- templates/systemd.tmpl	2018-10-31 13:18:40 +0000
+++ templates/systemd.tmpl	2020-03-20 19:41:15 +0000
@@ -16,6 +16,10 @@
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s TERM $MAINPID
 PrivateTmp=true
+{% if restart_on_failure %}
+Restart=on-failure
+RestartSec=30
+{% endif %}
 
 [Install]
 WantedBy=multi-user.target