Merge lp:~thedac/charms/precise/errors/use-upstart-gunicorn into lp:~daisy-pluckers/charms/precise/errors/trunk

Proposed by David Ames on 2014-03-18
Status: Needs review
Proposed branch: lp:~thedac/charms/precise/errors/use-upstart-gunicorn
Merge into: lp:~daisy-pluckers/charms/precise/errors/trunk
Diff against target: 22 lines (+2/-2)
2 files modified
hooks/install (+1/-1)
hooks/wsgi-file-relation-changed (+1/-1)
To merge this branch: bzr merge lp:~thedac/charms/precise/errors/use-upstart-gunicorn
Reviewer Review Type Date Requested Status
Daisy Pluckers 2014-03-18 Pending
Review via email: mp+211640@code.launchpad.net

Description of the change

The charm store version of the gunicorn charm uses upstart. This branch has the changes needed in the errors charm to work with it.

*****
Only merge If and ONLY If we decide to use the charm store version of gunicorn
****

To post a comment you must log in.

Unmerged revisions

36. By David Ames on 2014-03-18

Make errors work with upstart version of gunicorn

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2013-05-03 11:02:27 +0000
3+++ hooks/install 2014-03-18 22:10:55 +0000
4@@ -49,6 +49,6 @@
5 save_setting "oops_repository" "$OOPS_LOCAL"
6
7 chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "/srv/$BASEDIR"
8-chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$OOPS_LOCAL"
9+chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$OOPS_LOCAL" "$LOG_DIR"
10
11 exit 0
12
13=== modified file 'hooks/wsgi-file-relation-changed'
14--- hooks/wsgi-file-relation-changed 2013-05-02 15:52:49 +0000
15+++ hooks/wsgi-file-relation-changed 2014-03-18 22:10:55 +0000
16@@ -18,5 +18,5 @@
17 relation-set $OPTION wsgi_group="$GROUP_CODE_RUNNER"
18 relation-set $OPTION port="$LISTEN_PORT"
19 relation-set $OPTION wsgi_access_logfile="$LOG_DIR/errors-access.log"
20-relation-set $OPTION wsgi_extra="'--error-logfile=$LOG_DIR/errors-error.log',"
21+relation-set $OPTION wsgi_extra="--error-logfile=$LOG_DIR/errors-error.log"
22 relation-set $OPTION wsgi_wsgi_file='wsgi:application'

Subscribers

People subscribed via source and target branches

to all changes: