From f672eea37bdc0b5ebd965355b2d2502a4590bd99 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy@sandywalsh.com>
Date: Tue, 19 Aug 2014 07:21:40 +0000
Subject: [PATCH] proper audit period names

---
 bin/event_pump.py   | 12 ++++++++++--
 notigen/__init__.py | 10 +++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bin/event_pump.py b/bin/event_pump.py
index daed6f5..69a9128 100644
--- a/bin/event_pump.py
+++ b/bin/event_pump.py
@@ -23,9 +23,14 @@ queue = driver.create_queue(queue_name, exchange, queue_name,
                             channel=connection.channel())
 queue.declare()
 
+print "Usage: python event_pump.py <template_dir> <operations/hour> " \
+      "<realtime? 1/0>"
 template_dir = sys.argv[1]
 rate = int(sys.argv[2])
+realtime = int(sys.argv[3]) == 1
 print "Using template dir:", template_dir
+print "Rate:", rate
+print "Real-time?", realtime
 
 g = notigen.EventGenerator(template_dir, rate)
 now = datetime.datetime.utcnow()
@@ -38,6 +43,9 @@ while now < end:
         nevents += len(e)
         for event in e:
             driver.send_notification(event, queue_name, connection, exchange)
-            print nevents, event['timestamp'], event['event_type']
+            print event['timestamp'], event['event_type']
 
-    now = datetime.datetime.utcnow()
+    if realtime:
+        now = datetime.datetime.utcnow()
+    else:
+        now = g.move_to_next_tick(now)
diff --git a/notigen/__init__.py b/notigen/__init__.py
index c2ac6c6..31f0ca3 100644
--- a/notigen/__init__.py
+++ b/notigen/__init__.py
@@ -137,8 +137,6 @@ class EventGenerator(object):
                 else:
                     self.instances_in_use.add(uuid)
 
-            print "%s %4s-%s %s" % (when, uuid[-4:], operation[17:],
-                                    event['event_type'])
             del event['____context____']
             ready.append(event)
 
@@ -156,13 +154,11 @@ class EventGenerator(object):
                                         operation, context_hints, template)
                 for when, event in sequence:
                     payload = event['payload']
-                    del event['____context____']
-                    payload['audit_period_beginning'] = audit_period_start
-                    payload['audit_period_ending'] = audit_period_start
+                    payload['audit_period_beginning'] = str(audit_period_start)
+                    payload['audit_period_ending'] = str(audit_period_end)
                     payload['instance_id'] = instance
-                    print "%s %s %s" % (now, instance, event['event_type'])
                     ready.append(event)
-
+            self.instances_in_use = set()
         return ready
 
     def _get_sequence(self, now):