Merge lp:~thedac/charms/precise/gunicorn/fix-config-changed into lp:~charmers/charms/precise/gunicorn/trunk

[David Ames]

The config-changed hook does not have JUJU_REMOTE_UNIT set in the environment. This uses the relation data to get the remote unit name.

[Matt Bruzek (mbruzek)]

I took a look at this merge proposal and found the gunicorn README is not correct. I added to the existing bug here: https://bugs.launchpad.net/charms/+source/gunicorn/+bug/1193026

Got the new code with:
bzr branch lp:~bloodearnest/charms/precise/gunicorn/upgrade-path precise/gunicorn

I was able to get the code in this charm to deploy successfully with the following commands (from the python-django README):

juju bootstrap -e local
juju deploy python-django
juju deploy postgresql
add-relation python-django postgresql:db
juju deploy local:precise/gunicorn
juju expose python-django
juju add-relation python-django gunicorn

I was then able to verify that both the new and old format works by looking in the /etc/init/gunicorn.conf for changes when I ran the following commands:
juju run --unit python-django/0 "relation-ids wsgi" (the output me to use wgsi:2)
juju run --unit python-django/0 "relation-set -r wsgi:2 env_extra='A=5'" (the new format)
juju run --unit python-django/0 'relation-set -r wsgi:2 env_extra="\"A\":2"' (the old format)

+1 LGTM

[lp:~thedac/charms/precise/gunicorn/fix-config-changed]

31. By David Ames on 2014-04-18

Update README with working deploy directions

[Simon Davy (bloodearnest)]

I have incorpated this in https://code.launchpad.net/~bloodearnest/charms/precise/gunicorn/upgrade-path/+merge/213236

[Simon Davy (bloodearnest)]

Incorporated into https://code.launchpad.net/~bloodearnest/charms/precise/gunicorn/upgrade-path/+merge/213236

[Matt Bruzek (mbruzek)]

This change was superceded by https://code.launchpad.net/~bloodearnest/charms/precise/gunicorn/upgrade-path/+merge/213236

review: Needs Fixing

[Matt Bruzek (mbruzek)]

Hello David,

Thank you for your submission, this problem was address by Simon Davy (bloodearnest) in a different merge propsoal that was merged today. I rejected this merge proposal because the problem was already addressed by the merge. Please contact me or reopen the merge proposal if you have anything else to add.

Thank you,

  - Matt Bruzek

Unmerged revisions

31. By David Ames on 2014-04-18

Update README with working deploy directions

30. By David Ames on 2014-03-18

Fix broken config-changed hook. Config-changed does not have JUJU_REMOTE_UNIT set in the environment

=== modified file 'README.md'
--- README.md	2013-08-02 19:14:04 +0000
+++ README.md	2014-04-18 20:22:57 +0000
@@ -20,16 +20,18 @@
  1. Deployment with python-moinmoin for example::
 
         juju bootstrap
-        juju deploy --config mywiki_with_wsgi_settings.yaml python-moinmoin
+        juju deploy python-django
+        juju deploy postgresql
+        juju add-relation python-django postgresql:db
         juju deploy gunicorn
-        juju add-relation gunicorn python-moinmoin
-        juju expose python-moinmoin
+        juju expose python-django
+        juju add-relation python-django gunicorn
 
- 1. Accessing your new wiki should be ready at::
+ 1. Accessing your new django site should be ready at::
 
         http://<machine-addr>:8080/
 
-   To find out the public address of gunicorn/python-moinmoin, look for it in
+   To find out the public address of gunicorn/python-django, look for it in
    the output of the `juju status` command.
    I recommend using a reverse proxy like Nginx in front of Gunicorn. 
 
@@ -49,4 +51,4 @@
 - no start/stop hook anymore use related charms instead.
 - no configuration change directly on the charm anymore, use related charms instead.
 - no access logging by default
-- exposing a port must now be done in the linked charm instead of this one
\ No newline at end of file
+- exposing a port must now be done in the linked charm instead of this one

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-02-27 14:54:18 +0000
+++ hooks/hooks.py	2014-04-18 20:22:57 +0000
@@ -29,8 +29,8 @@
     return s
 
 
-def sanitized_service_name():
-    return sanitize(hookenv.remote_unit().split('/')[0])
+def sanitized_service_name(service_name):
+    return sanitize(service_name.split('/')[0])
 
 
 def upstart_conf_path(name):
@@ -76,7 +76,7 @@
 
     relation_data = relations[0]
 
-    service_name = sanitized_service_name()
+    service_name = sanitized_service_name(relation_data['__unit__'])
     wsgi_config['unit_name'] = service_name
 
     project_conf = upstart_conf_path(service_name)
@@ -117,7 +117,7 @@
 
 @hooks.hook("wsgi_file_relation_broken")
 def wsgi_file_relation_broken():
-    service_name = sanitized_service_name()
+    service_name = sanitized_service_name(hookenv.remote_unit())
     host.service_stop(service_name)
     try:
         os.remove(upstart_conf_path(service_name))