Merge lp://staging/~bloodearnest/charms/precise/gunicorn/cleanup into lp://staging/~charmers/charms/precise/gunicorn/trunk
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Merged at revision: | 29 |
| Proposed branch: | lp://staging/~bloodearnest/charms/precise/gunicorn/cleanup |
| Merge into: | lp://staging/~charmers/charms/precise/gunicorn/trunk |
| Diff against target: |
2086 lines (+1481/-446) 15 files modified
.bzrignore (+1/-0) Makefile (+12/-0) charm-helpers.yaml (+5/-0) config.yaml (+6/-0) hooks/charmhelpers/core/hookenv.py (+401/-0) hooks/charmhelpers/core/host.py (+291/-0) hooks/charmhelpers/fetch/__init__.py (+279/-0) hooks/charmhelpers/fetch/archiveurl.py (+48/-0) hooks/charmhelpers/fetch/bzrurl.py (+49/-0) hooks/hooks.py (+84/-444) hooks/tests/test_hooks.py (+157/-0) hooks/tests/test_template.py (+125/-0) metadata.yaml (+4/-0) templates/upstart.tmpl (+13/-2) test_requirments.txt (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/charms/precise/gunicorn/cleanup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
| Michael Nelson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Clean up of gunicorn charm, adding charmhelpers, tests and re-add env_extra param
Description of the change
Clean up of gunicorn charm.
Apologies for the large diff - it's mostly bundling charm helpers
Main highlights
- use charmhelpers, and thus remove lots of code that was doing the same stuff
- tests \o/
- slight cleanups and refactors (e.g. not shelling out to multiprocess, when we can just import it)
- add support back in for "env_extra", which we use in our IS version to set process envvars (was strangely removed in python rewrite), albeit with a slightly different (better) format.
- add support for config-changed hook (only when wsgi-file relation is present)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1. I'm now using this version of the charm for deploying a new service (as I needed the env_extra option).
Most of the green diff below is just the result of syncing a recent charm-helpers.
Great to see some tests, and great to trim down the hooks.py by using charmhelpers instead.
Thanks!