summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Colmer <philip.colmer@linaro.org>2014-01-22 16:15:25 +0000
committerPhilip Colmer <philip.colmer@linaro.org>2014-01-22 16:15:25 +0000
commit22ff7739ef08261dae2ef189bcd72c1d1b666206 (patch)
tree7dc18264f758a75cc260cb47104a7f67dde7f78b
parentb8f443b0ca6368406f2040d81bb29538a623530e (diff)
downloadlinaro-healthcheck-22ff7739ef08261dae2ef189bcd72c1d1b666206.tar.gz
Bug fixes around frozen state change
-rw-r--r--healthcheck.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/healthcheck.py b/healthcheck.py
index f8b1ef5..8cd7a2c 100644
--- a/healthcheck.py
+++ b/healthcheck.py
@@ -51,7 +51,7 @@ class HealthCheck(object):
# Only log IP address info when a change happens
if (service_ip != self.last_address):
- self.logmsg("Service IP = %s, this IP = %s, last service IP = %s" % (service_ip, self.system_ip, self.last_address))
+ self.logmsg("Service IP = %s, last service IP = %s, this IP = %s" % (service_ip, self.last_address, self.system_ip))
if (os.path.isfile(self.script_directory + "/frozen")):
if (self.last_state != States.Frozen):
@@ -166,7 +166,7 @@ class HealthCheck(object):
new_response = 500
# Clean up some of the trigger files
- if (new_state != States.Active):
+ if (new_state != States.Active and new_state != States.Frozen):
self.silentremove("/healthy")
if (new_state != States.Maintenance):
self.silentremove("/maintenance")