X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fec2_observer%2Fevent_loop.py;h=d9855eb564c413e78617f9b8b9c22041e865c33f;hb=refs%2Fheads%2Fobserver3.0;hp=dd81e24ac752949d095e1f73d9fc90e9983a934c;hpb=09e486743d9fd9d415b72f82df564b895e6622eb;p=plstackapi.git

diff --git a/planetstack/ec2_observer/event_loop.py b/planetstack/ec2_observer/event_loop.py
index dd81e24..d9855eb 100644
--- a/planetstack/ec2_observer/event_loop.py
+++ b/planetstack/ec2_observer/event_loop.py
@@ -19,7 +19,7 @@ from planetstack.config import Config
 from ec2_observer.steps import *
 from syncstep import SyncStep
 from toposort import toposort
-from ec2_observer.error_mapper import error_mapper
+from ec2_observer.error_mapper import *
 
 debug_mode = False
 
@@ -239,7 +239,7 @@ class PlanetStackObserver:
 
 				# Two passes. One for sync, the other for deletion.
 				for deletion in (False,True):
-					logger.info('Creation pass...')
+					logger.info('Deletion=%r...'%deletion)
 					# Set of whole steps that failed
 					failed_steps = []
 
@@ -295,10 +295,7 @@ class PlanetStackObserver:
 								if failed_objects:
 									failed_step_objects.update(failed_objects)
 
-								if (not deletion):
-									self.update_run_time(sync_step)
-								else:
-									self.update_deletion_run_time(sync_step)
+								self.update_run_time(sync_step,deletion)
 							except Exception,e:
 								logging.error('Model step failed. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!',e)
 								logger.log_exc(e)