Merge lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging into lp://staging/ubuntu-ci-services-itself
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging | ||||
| Merge into: | lp://staging/ubuntu-ci-services-itself | ||||
| Diff against target: |
1763 lines (+1264/-121) 22 files modified
charms/precise/gunicorn/README.md (+52/-0) charms/precise/gunicorn/config.yaml (+81/-0) charms/precise/gunicorn/copyright (+17/-0) charms/precise/gunicorn/hooks/hooks.py (+492/-0) charms/precise/gunicorn/icon.svg (+377/-0) charms/precise/gunicorn/metadata.yaml (+15/-0) charms/precise/gunicorn/revision (+1/-0) charms/precise/gunicorn/templates/upstart.tmpl (+34/-0) charms/precise/python-django/hooks/hooks.py (+67/-46) charms/precise/python-django/templates/settings.tmpl (+37/-6) charms/precise/python-django/templates/urls.tmpl (+9/-0) juju-deployer/branch-source-builder.yaml.tmpl (+0/-1) juju-deployer/deploy.py (+2/-1) juju-deployer/image-builder.yaml.tmpl (+0/-1) juju-deployer/lander.yaml.tmpl (+0/-1) juju-deployer/ppa-assigner.yaml.tmpl (+10/-3) juju-deployer/production-only.yaml (+1/-1) juju-deployer/test-runner.yaml.tmpl (+0/-1) juju-deployer/ticket-system.yaml.tmpl (+12/-5) ppa-assigner/ppa_assigner/ppa_sync.py (+5/-2) ppa-assigner/ppa_assigner/settings.py (+30/-28) ticket_system/ticket_system/settings.py (+22/-25) |
||||
| To merge this branch: | bzr merge lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Evan (community) | Needs Resubmitting | ||
| Andy Doan (community) | Approve | ||
| Chris Johnston (community) | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
- Teach gunicorn to properly write gunicorn access and error logs under /srv/${
- Store all the Django configuration under /srv/${
- Store lp:ubuntu-ci-services-itself under /srv/${
- Store variable data under /srv/${
- Log Django errors to /srv/${
Description of the change
Deploy django/gunicorn with the following structure:
/srv/${
- Teach gunicorn to properly write gunicorn access and error logs under /srv/${
- Store all the Django configuration under /srv/${
- Store lp:ubuntu-ci-services-itself under /srv/${
- Log Django errors to /srv/${
We can later add /srv/${
My intention is to move onto rabbitmq-worker and the other charms to provide the same structure. We should have a consistent place to look when problems occur.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Andy Doan (doanac) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Andy Doan (doanac) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Andy Doan (doanac) wrote | # |
| Andy Doan (doanac) wrote | # |
| Chris Johnston (cjohnston) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Andy Doan (doanac) wrote | # |
| Andy Doan (doanac) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 308. By Evan
-
Include timestamps in django log messages.
- 307. By Evan
-
Missing import.
- 306. By Evan
-
Actually setting the VARDIR would help.
- 305. By Evan
-
Safely write the lpcreds file. Put it under a writable directory.
- 304. By Evan
-
Fix setting CONFDIR and LOGDIR.
- 303. By Evan
-
How'd this sneak in here. Gunicorn lives in the branch for now.
- 302. By Evan
-
Merge with trunk.
- 301. By Evan
-
Set the PYTHONPATH appropriately on the relation.
- 300. By Evan
-
Move the parts specific to the PPA Assigner and Ticket System back into those components. This code need not live in the python-django charm so long as we can pass a reference to the config file root.
- 299. By Evan
-
Unused import. Thanks Chris.
FAILED: Continuous integration, rev:295
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
Click here to trigger a rebuild:
http://