Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/restish-logging into lp://qastaging/uci-engine

  1. restish-logging
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 610
Merged at revision: 612
Proposed branch: lp://qastaging/~doanac/uci-engine/restish-logging
Merge into: lp://qastaging/uci-engine
Diff against target: 127 lines (+31/-22)
5 files modified
charms/precise/restish/hooks/hooks.py (+16/-11)
charms/precise/restish/unit_tests/test_hooks.py (+12/-11)
juju-deployer/gatekeeper.yaml.tmpl (+1/-0)
juju-deployer/ppa-assigner.yaml.tmpl (+1/-0)
juju-deployer/webui.yaml.tmpl (+1/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/restish-logging
Reviewer Review Type Date Requested Status
Evan (community) Needs Fixing
Celso Providelo (community) Approve
Para Siva (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+224361@code.qastaging.launchpad.net

Commit message

restish charm: fix to work with i/s requirement

As discussed with i/s this will get us going with:

 /srv/ci-airline-gatekeeper-restish/logs/access.log
 /srv/ci-airline-gatekeeper-restish/logs/gunicorn.log

Description of the change

take 2: gets us DEBUG logging from gunicorn and fixes the log location for restish

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:610
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/928/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/928/rebuild

review: Approve (continuous-integration)
Revision history for this message
Para Siva (psivaa) wrote :

Thanks for picking it up doanac. I just did a deployment with this and the gunicorn worker just runs fine.

review: Approve
Revision history for this message
Celso Providelo (cprov) :
review: Approve
Revision history for this message
Evan (ev) wrote :

Just one comment inline about hardcoding.

review: Needs Fixing
Revision history for this message
Andy Doan (doanac) wrote :

On 06/24/2014 05:08 PM, Evan Dandrea wrote:
>> + if not os.path.exists(ldir):
>> >+ charmhelpers.core.host.mkdir(ldir, 'www-data', 'www-data', 0755)
> Shouldn't this grab wsgi_user and wsgi_group from the relation to the subordinate (gunicorn)? If memory serves, IS likes to deploy as webops_deploy / webops_code_runner:
>
> https://wiki.canonical.com/InformationInfrastructure/IS/Policies/Prodstack#Separate_Users_for_Code_Owner_and_Code_Runner
>
> It does seem possible:
> "The providers of the wsgi relation must provide working_dir, plus optionally any of the charm's config directives, which will override the current config for the charm."
>

its a good point. I think if we are going to spend time on this, we
should instead make the gunicorn charm create a better upstart job
definition (that includes a pre-start stanza that ensures the directory
exists). Otherwise, you leave yourself open to simple user errors where
someone accidentally deletes a logs directory and the app can never
start again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches