Merge lp://qastaging/~doanac/uci-engine/3-webui-show-logs into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 459
Merged at revision: 459
Proposed branch: lp://qastaging/~doanac/uci-engine/3-webui-show-logs
Merge into: lp://qastaging/uci-engine
Prerequisite: lp://qastaging/~doanac/uci-engine/2-no-jenkins
Diff against target: 104 lines (+36/-6)
5 files modified
charms/precise/lander/metadata.yaml (+3/-0)
charms/precise/webui/hooks/hooks.py (+27/-4)
charms/precise/webui/metadata.yaml (+2/-1)
juju-deployer/configs/webui_http_vhost (+2/-0)
juju-deployer/relations.yaml (+2/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/3-webui-show-logs
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Joe Talbott (community) Approve
Francis Ginther Approve
Review via email: mp+217093@code.qastaging.launchpad.net

Commit message

lander/webui: add ability to display lander logs from webui

This allows the lander and webui to establish a relationship so
that the webui can proxy requests to view log files of tickets
from the lander

Description of the change

This allows you to go to:

 http://<webui>/logs/

and see all the logs from the lander. Since we no longer have jenkins, this makes it easy to find things and also see what's happening in realtime.

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

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

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

review: Needs Fixing (continuous-integration)
453. By Andy Doan

merge with parent branch for unit-test fix

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

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

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

review: Approve (continuous-integration)
454. By Andy Doan

merge with pre-req branch

455. By Andy Doan

as per vila: use abspath

456. By Andy Doan

oops - forgot to add the apache config required

457. By Andy Doan

lander/webui: add ability to display lander logs from webui

This allows the lander and webui to establish a relationship so
that the webui can proxy requests to view log files of tickets
from the lander

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

i rebased this on the latest lp:~doanac/uci-engine/2-no-jenkins and the history should be cleaner

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) wrote :

Looks okay to me except I think maybe we'd want to use a more specific url than */logs since we might want other component logs in the future. Maybe */logs/lander?

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

On 04/30/2014 11:16 AM, Joe Talbott wrote:
> Looks okay to me except I think maybe we'd want to use a more specific url than */logs since we might want other component logs in the future. Maybe */logs/lander?

good idea. i'll work that up.

Revision history for this message
Francis Ginther (fginther) wrote :

Looks reasonable. I can't provide input on the apache parts, but the relations look good.

review: Approve
458. By Andy Doan

merge with trunk

459. By Andy Doan

make logs proxying more generic

This was tied completly to the lander, but as Joe noted we might want
to share logs from other places. This lets us establish a "proxy_logs"
relationship between services.

Revision history for this message
Joe Talbott (joetalbott) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/566/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