From 4de2aaa074400775ba18cf79c2c27d8b30f108d2 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy@sandywalsh.com>
Date: Thu, 29 May 2014 18:51:17 +0000
Subject: [PATCH] change from 'event' to 'event_type'
---
bin/event_consumer.py | 2 +-
bin/event_pump.py | 2 +-
notigen/__init__.py | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/event_consumer.py b/bin/event_consumer.py
index bd7cc04..6bc26d7 100644
--- a/bin/event_consumer.py
+++ b/bin/event_consumer.py
@@ -14,7 +14,7 @@ class Callback(object):
def on_event(self, deployment, routing_key, body, exchange):
print "Got:", body
self.x += 1
- if self.x > 10:
+ if self.x > 100000:
sys.exit(1)
def shutting_down(self):
diff --git a/bin/event_pump.py b/bin/event_pump.py
index 059ae1d..77efab9 100644
--- a/bin/event_pump.py
+++ b/bin/event_pump.py
@@ -32,6 +32,6 @@ while nevents < 10000:
nevents += len(e)
for event in e:
driver.send_notification(event, queue_name, connection, exchange)
- print nevents, event['when'], event['event']
+ print nevents, event['when'], event['event_type']
now = datetime.datetime.utcnow()
diff --git a/notigen/__init__.py b/notigen/__init__.py
index 88bdf8a..0bb7c37 100644
--- a/notigen/__init__.py
+++ b/notigen/__init__.py
@@ -163,7 +163,7 @@ class EventGenerator(object):
self.instances_in_use.add(uuid)
elif event['is_delete']:
self.instances_in_use.remove(uuid)
- #print "%s %40s U:%4s" % (' ' * 20, event['event'], uuid[-4:])
+ #print "%s %40s U:%4s" % (' ' * 20, event['event_type'], uuid[-4:])
ready.append(event)
def _get_action(self, now):
@@ -273,13 +273,13 @@ class EventGenerator(object):
if event[-1] == '*':
event = event[0:-1]
extra = {'when': now, 'node': node}
- results.append(self._pkg(base, extra, {'event': event + "start"}))
+ results.append(self._pkg(base, extra, {'event_type': event + "start"}))
now = self._bump_time(now, 0.25, 60.0 * 15.0) # In compute node
extra = {'when': now, 'node': node}
- results.append(self._pkg(base, extra, {'event': event + "end"}))
+ results.append(self._pkg(base, extra, {'event_type': event + "end"}))
else:
extra = {'when': now, 'node': node}
- results.append(self._pkg(base, extra, {'event': event}))
+ results.append(self._pkg(base, extra, {'event_type': event}))
return results
def _pkg(self, *args):