Move more of retry logic away from BaseConsumer/Event classes

1 files changed, 16 insertions, 5 deletions

diff --git a/python/pgq/event.py b/python/pgq/event.py
index 8feb694f..ddd550e4 100644
--- a/python/pgq/event.py
+++ b/python/pgq/event.py
@@ -38,24 +38,23 @@ class Event(object):
 
     Will be removed from the queue by default.
     """
-    __slots__ = ('_event_row', '_status', 'retry_time',
+    __slots__ = ('_event_row', 'retry_time',
                  'queue_name')
 
     def __init__(self, queue_name, row):
         self._event_row = row
-        self._status = EV_DONE
         self.retry_time = 60
         self.queue_name = queue_name
 
     def __getattr__(self, key):
         return self._event_row[_fldmap[key]]
 
+    # would be better in RetriableEvent only since we don't care but
+    # unfortunatelly it needs to be defined here due to compatibility concerns
     def tag_done(self):
+        pass
         self._status = EV_DONE
 
-    def get_status(self):
-        return self._status
-
     # be also dict-like
     def __getitem__(self, k): return self._event_row.__getitem__(k)
     def __contains__(self, k): return self._event_row.__contains__(k)
@@ -76,6 +75,18 @@ class RetriableEvent(Event):
     Consumer is supposed to tag them after processing.
     """
 
+    __slots__ = Event.__slots__ + ('_status', )
+
+    def __init__(self, queue_name, row):
+        super(RetriableEvent, self).__init__(self, queue_name, row)
+        self._status = EV_DONE
+
+    def tag_done(self):
+        self._status = EV_DONE
+
+    def get_status(self):
+        return self._status
+
     def tag_retry(self, retry_time = 60):
         self._status = EV_RETRY
         self.retry_time = retry_time