Ubuntu CI Services

Merge lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status into lp://staging/ubuntu-ci-services-itself

json-jsonp-status
Merge into trunk

Proposed by Andy Doan on 2014-03-01

Status:	Merged
Approved by:	Chris Johnston on 2014-03-03
Approved revision:	301
Merged at revision:	299
Proposed branch:	lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status
Merge into:	lp://staging/ubuntu-ci-services-itself
Diff against target:	175 lines (+63/-0) 9 files modified charms/precise/restish/config.yaml (+4/-0) charms/precise/restish/hooks/hooks.py (+13/-0) charms/precise/restish/metadata.yaml (+3/-0) charms/precise/webui/hooks/hooks.py (+35/-0) charms/precise/webui/metadata.yaml (+2/-0) juju-deployer/branch-source-builder.yaml.tmpl (+1/-0) juju-deployer/image-builder.yaml.tmpl (+1/-0) juju-deployer/relations.yaml (+3/-0) juju-deployer/test-runner.yaml.tmpl (+1/-0)
To merge this branch:	bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-03
Andy Doan (community)			Approve on 2014-03-03
Evan (community)		2014-03-01	Approve on 2014-03-03
Review via email: mp+208915@code.staging.launchpad.net

Commit message

integrate monitoring api into webui

Provide a simple mechansim for the webui to get monitor the status of other services.
(restish only for this change)

Description of the change

provides the charming logic required to fix:

https://bugs.launchpad.net/bugs/1285360

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-01:

FAILED: Continuous integration, rev:300
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/265/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Evan (ev) wrote on 2014-03-03:

Looks good. +1

review: Approve

Revision history for this message

Evan (ev) wrote on 2014-03-03:

110 +@hooks.hook('json_status-relation-changed')
111 +def json_status_relation_changed():
112 + json_status_relation_joined()

Minor nit, but couldn't you just decorate json_status_relation_joined() with hooks.hook('json_status-relation-changed')?

Revision history for this message

Andy Doan (doanac) wrote on 2014-03-03:

On 03/03/2014 03:10 AM, Evan Dandrea wrote:
> 110 +@hooks.hook('json_status-relation-changed')
> 111 +def json_status_relation_changed():
> 112 + json_status_relation_joined()
>
> Minor nit, but couldn't you just decorate json_status_relation_joined() with hooks.hook('json_status-relation-changed')?

I wasn't positive if was safe with the hooks.hook decorator to have it
twice for a function. I'm re-doplying this morning, so it should be easy
to find out :)

lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status updated on 2014-03-03

301. By Andy Doan on 2014-03-03

use one hook function for joined/changed

as noted by evan

Revision history for this message

Andy Doan (doanac) wrote on 2014-03-03:

revno 301 fixes ev's comment. he's already acked the patch.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

FAILED: Continuous integration, rev:301
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/267/
Executed test runs:

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