Merge lp:~brian-murray/charms/precise/errors/move-gunicorn-restart into lp:~daisy-pluckers/charms/precise/errors/trunk

[Brian Murray]

This is a result of RT #71934 where this command was run:

"juju set e-t-errors-app errors_static_url=https://assets.ubuntu.com/sites/errors/478/"

but the errors front ends did not start using the new assets url. This is becasue the config-changed hook does not restart gunicorn. This branch just moves the restart from upgrade-charm to config-changed.

I wanted to have another person look at this as charms aren't my forte.

[Tom Haddon (mthaddon)]

Looks okay to me, as long as the service can tolerate slightly more frequent restarts (config-changed gets called more often than upgrade-charm).

review: Approve

[lp:~brian-murray/charms/precise/errors/move-gunicorn-restart]

39. By Brian Murray on 2014-05-27

config-changed is automatically run after upgrade-charm

[David Ames (thedac)]

+1 Looks good

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-03-10 23:53:55 +0000
+++ hooks/config-changed	2014-05-27 18:45:14 +0000
@@ -34,3 +34,5 @@
 fi
 
 save_setting "oops_repository" "$OOPS_LOCAL"
+
+service gunicorn restart

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2013-05-13 15:42:57 +0000
+++ hooks/upgrade-charm	2014-05-27 18:45:14 +0000
@@ -9,5 +9,3 @@
 # new configuration options with this code deployment, some of which may not be
 # tunable via config.yaml, but still necessary.
 cp "$DAISY_LOCATION/daisy/configuration.py" "$LOCAL_CONFIG_PATH"
-hooks/config-changed
-service gunicorn restart