Merge lp:~verterok/charms/trusty/tanuki-spec-manager/disable-poller-check into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

Proposed by Guillermo Gonzalez on 2015-10-05
Status: Merged
Approved by: Guillermo Gonzalez on 2015-10-05
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~verterok/charms/trusty/tanuki-spec-manager/disable-poller-check
Merge into: lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk
Diff against target: 14 lines (+3/-1)
1 file modified
hooks/actions.py (+3/-1)
To merge this branch: bzr merge lp:~verterok/charms/trusty/tanuki-spec-manager/disable-poller-check
Reviewer Review Type Date Requested Status
Samuele Pedroni 2015-10-05 Approve on 2015-10-05
Review via email: mp+273415@code.launchpad.net

Commit message

use check_dummy instead of negate to disable store poller check

Description of the change

use check_dummy instead of negate to disable store poller check

To post a comment you must log in.
Samuele Pedroni (pedronis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/actions.py'
--- hooks/actions.py 2015-09-22 04:32:19 +0000
+++ hooks/actions.py 2015-10-05 14:40:23 +0000
@@ -344,7 +344,9 @@
344 # it exists.344 # it exists.
345 if os.path.exists(log_path):345 if os.path.exists(log_path):
346 os.rename(log_path, log_path + ".old")346 os.rename(log_path, log_path + ".old")
347 check_cmd = "negate {}".format(check_cmd)347 # use check_dummy instead of negate, because the log file might not
348 # exist
349 check_cmd = "check_dummy 0 'Store poller is disabled'"
348350
349 nrpe_compat.add_check(351 nrpe_compat.add_check(
350 shortname="store_poller_check",352 shortname="store_poller_check",

Subscribers

People subscribed via source and target branches