summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-02-16 18:35:43 -0800
committerSandy Walsh <sandy.walsh@rackspace.com>2011-02-16 18:35:43 -0800
commit984db08a205bdd9196c3e1cc3415873a853c33ba (patch)
tree0f7bbf086e6d161b20175efae806ced5652b86c2 /nova
parent719dbda7f8b856af334744de4807036e6ee704c1 (diff)
style cleanup
Diffstat (limited to 'nova')
-rw-r--r--nova/scheduler/zone_manager.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py
index a6bbc2ebd..a35acb000 100644
--- a/nova/scheduler/zone_manager.py
+++ b/nova/scheduler/zone_manager.py
@@ -84,14 +84,16 @@ def _call_novatools(zone):
os = novatools.OpenStack(zone.username, zone.password, zone.api_url)
return os.zones.info()._info
+
def _poll_zone(zone):
"""Eventlet worker to poll a zone."""
- logging.debug("_POLL_ZONE: STARTING")
+ logging.debug(_("Polling zone: %s") % zone.api_url)
try:
zone.update_metadata(_call_novatools(zone))
except Exception, e:
zone.log_error(e)
+
class ZoneManager(object):
"""Keeps the zone states updated."""
def __init__(self):
@@ -122,10 +124,9 @@ class ZoneManager(object):
def ping(self, context=None):
"""Ping should be called periodically to update zone status."""
- logging.debug("ZoneManager PING")
diff = datetime.now() - self.last_zone_db_check
if diff.seconds >= FLAGS.zone_db_check_interval:
- logging.debug("ZoneManager RECHECKING DB ")
+ logging.debug("Updating zone cache from db.")
self.last_zone_db_check = datetime.now()
self._refresh_from_db(context)
self._poll_zones(context)