Ubuntu CI Engine

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

  1. lander-logging
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 603
Merged at revision: 606
Proposed branch: lp://qastaging/~doanac/uci-engine/lander-logging
Merge into: lp://qastaging/uci-engine
Diff against target: 127 lines (+33/-16)
3 files modified
charms/precise/lander/hooks/hooks.py (+23/-12)
juju-deployer/configs/lander_http_vhost (+3/-3)
lander/bin/json_status_cgi.py (+7/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/lander-logging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Evan (community) Approve
Review via email: mp+224201@code.qastaging.launchpad.net

Commit message

lander charm: fix logging

i/s confirmed logging for this componet should go to:

 /srv/ci-airline-lander/logs

This required a few changes:

1) change the "service_dir" to use dashes and not underscores
This made a new upstart service name. This broke that json_status cgi
script *again*. So I tried to change this in a way that it can be
updated in the future without breakage.

2) update the "lander logs" location
We were logging results from processing tickets under "logs". I chaged
this to "lander-logs" so it won't collide with our upstart logs.

3) make the charm / upstart script smarter
This gets us logging in the correct place, but it also lets the upstart
job ensure the proper directories exist before the job is launched. This
makes things safer in the event someone deletes the logs directory and
restarts the service

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Evan (ev) wrote :

A few small fixes requested inline. Otherwise +1

review: Approve
lp://qastaging/~doanac/uci-engine/lander-logging updated
602. By Andy Doan

ev suggestions

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

mostly fixed in revno 602

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Evan (ev) wrote :

On 23 June 2014 23:23, Andy Doan <email address hidden> wrote:
>> def _service_name(config):
>> unit = os.environ['JUJU_UNIT_NAME'].split('/')[0]
>> - for x in (':', '-', '/', '"', "'"):
>> + for x in (':', '/', '"', "'"):
>
> does charmhelpers have anything like this? I've never found anything

charmhelpers.core.hookenv.service_name()

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

On 06/23/2014 05:45 PM, Evan Dandrea wrote:
> On 23 June 2014 23:23, Andy Doan <email address hidden> wrote:
>>> def _service_name(config):
>>> unit = os.environ['JUJU_UNIT_NAME'].split('/')[0]
>>> - for x in (':', '-', '/', '"', "'"):
>>> + for x in (':', '/', '"', "'"):
>>
>> does charmhelpers have anything like this? I've never found anything
>
> charmhelpers.core.hookenv.service_name()
>
 oh - i thought you were referring to the logic where we "sanitize" the
service name. I can change the line:

   unit = os.environ['JUJU_UNIT_NAME'].split('/')[0]

to use charmhelpers tomorrow.

lp://qastaging/~doanac/uci-engine/lander-logging updated
603. By Andy Doan

use charmhelpers for service-name

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

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