Merge lp:~macgreagoir/charms/precise/nrpe-external-master/upstart-critical into lp:charms/nrpe-external-master
Proposed by
Mick Gregg
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 40 | ||||
Proposed branch: | lp:~macgreagoir/charms/precise/nrpe-external-master/upstart-critical | ||||
Merge into: | lp:charms/nrpe-external-master | ||||
Diff against target: |
57 lines (+14/-7) 1 file modified
files/check_upstart_job (+14/-7) |
||||
To merge this branch: | bzr merge lp:~macgreagoir/charms/precise/nrpe-external-master/upstart-critical | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler (community) | Approve | ||
Adam Israel (community) | Approve | ||
Review via email: mp+254597@code.launchpad.net |
Description of the change
When a service is stopped an exception is thrown when trying to GetInstance() for its job. This needs to be caught to allow the calling block to return CRITICAL.
Related, the length of states[] in the exception block needs to be checked for 0, rather than assuming to use an empty array, where length of zero will equal a running count of zero.
To post a comment you must log in.
Hi Mick,
I had the opportunity to review this merge proposal today. All of my checks are passing, and I've confirmed that the fix works as intended.
Thanks for your work on this! +1