From ae7f30c5ff0830dbd413a83003b936ba607fc3ba Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 25 Sep 2013 12:46:50 -0400 Subject: [PATCH] fix NameError and AttribteError --- planetstack/observer/event_loop.py | 15 ++++++++------- planetstack/observer/steps/garbage_collector.py | 1 + .../observer/steps/sync_network_slivers.py | 1 + planetstack/observer/steps/sync_networks.py | 1 + .../observer/steps/sync_site_privileges.py | 1 + planetstack/observer/steps/sync_sites.py | 1 + .../observer/steps/sync_slice_memberships.py | 1 + planetstack/observer/steps/sync_slices.py | 1 + planetstack/observer/steps/sync_sliver_ips.py | 1 + planetstack/observer/steps/sync_slivers.py | 1 + planetstack/observer/steps/sync_users.py | 1 + 11 files changed, 18 insertions(+), 7 deletions(-) diff --git a/planetstack/observer/event_loop.py b/planetstack/observer/event_loop.py index 23e873f..f71ca00 100644 --- a/planetstack/observer/event_loop.py +++ b/planetstack/observer/event_loop.py @@ -153,16 +153,16 @@ class PlanetStackObserver: self.load_run_times() - def check_duration(self): + def check_duration(self, step, duration): try: - if (duration > S.deadline): - logger.info('Sync step %s missed deadline, took %.2f seconds'%(S.name,duration)) + if (duration > step.deadline): + logger.info('Sync step %s missed deadline, took %.2f seconds'%(step.name,duration)) except AttributeError: # S doesn't have a deadline pass def update_run_time(self, step): - self.last_run_times[step.name]=time.time() + self.last_run_times[step.__name__]=time.time() def check_schedule(self, step): time_since_last_run = time.time() - self.last_run_times[step.__name__] @@ -228,7 +228,7 @@ class PlanetStackObserver: self.check_schedule(sync_step) # dont run sync_network_routes if time since last run < 1 hour should_run = True except StepNotReady: - logging.info('Step not ready: %s'%sync_step.name) + logging.info('Step not ready: %s'%sync_step.__name__) failed_steps.append(sync_step) except: failed_steps.append(sync_step) @@ -241,8 +241,9 @@ class PlanetStackObserver: failed_objects = sync_step(failed=failed_step_objects) - check_deadline(sync_step, duration) - failed_step_objects.extend(failed_objects) + self.check_duration(sync_step, duration) + if failed_objects: + failed_step_objects.extend(failed_objects) self.update_run_time(sync_step) except: failed_steps.append(S) diff --git a/planetstack/observer/steps/garbage_collector.py b/planetstack/observer/steps/garbage_collector.py index 9e2a37d..431623d 100644 --- a/planetstack/observer/steps/garbage_collector.py +++ b/planetstack/observer/steps/garbage_collector.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep diff --git a/planetstack/observer/steps/sync_network_slivers.py b/planetstack/observer/steps/sync_network_slivers.py index e2556bb..dfb9d8d 100644 --- a/planetstack/observer/steps/sync_network_slivers.py +++ b/planetstack/observer/steps/sync_network_slivers.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.network import * diff --git a/planetstack/observer/steps/sync_networks.py b/planetstack/observer/steps/sync_networks.py index 02a1b23..82d6bc7 100644 --- a/planetstack/observer/steps/sync_networks.py +++ b/planetstack/observer/steps/sync_networks.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.network import * diff --git a/planetstack/observer/steps/sync_site_privileges.py b/planetstack/observer/steps/sync_site_privileges.py index 6ec917c..de8976d 100644 --- a/planetstack/observer/steps/sync_site_privileges.py +++ b/planetstack/observer/steps/sync_site_privileges.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.site import * diff --git a/planetstack/observer/steps/sync_sites.py b/planetstack/observer/steps/sync_sites.py index d7a0ab7..2013c6d 100644 --- a/planetstack/observer/steps/sync_sites.py +++ b/planetstack/observer/steps/sync_sites.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.site import Site diff --git a/planetstack/observer/steps/sync_slice_memberships.py b/planetstack/observer/steps/sync_slice_memberships.py index 0e9d681..2748fcd 100644 --- a/planetstack/observer/steps/sync_slice_memberships.py +++ b/planetstack/observer/steps/sync_slice_memberships.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.slice import * diff --git a/planetstack/observer/steps/sync_slices.py b/planetstack/observer/steps/sync_slices.py index d5ed266..9ba5ab7 100644 --- a/planetstack/observer/steps/sync_slices.py +++ b/planetstack/observer/steps/sync_slices.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.slice import Slice diff --git a/planetstack/observer/steps/sync_sliver_ips.py b/planetstack/observer/steps/sync_sliver_ips.py index fb4fd5b..2d7f1f8 100644 --- a/planetstack/observer/steps/sync_sliver_ips.py +++ b/planetstack/observer/steps/sync_sliver_ips.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.sliver import Sliver diff --git a/planetstack/observer/steps/sync_slivers.py b/planetstack/observer/steps/sync_slivers.py index 74a1b50..900840d 100644 --- a/planetstack/observer/steps/sync_slivers.py +++ b/planetstack/observer/steps/sync_slivers.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.sliver import Sliver diff --git a/planetstack/observer/steps/sync_users.py b/planetstack/observer/steps/sync_users.py index f222b43..00c9896 100644 --- a/planetstack/observer/steps/sync_users.py +++ b/planetstack/observer/steps/sync_users.py @@ -1,5 +1,6 @@ import os import base64 +from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.user import User -- 2.43.0