Add event ID

ims/service/eventsource.py

@@ -89,7 +89,7 @@ def removeListener(self, listener):
         self._listeners.add(listener)
 
 
-    def _transmogrify(self, loggerEvent):
+    def _transmogrify(self, loggerEvent, eventID):
         """
         Convert a logger event into an EventSource event.
         """
@@ -110,10 +110,13 @@ def _transmogrify(self, loggerEvent):
             else:
                 incidentNumber = incident.number
 
-            self.log.critical(
-                "Unable to determine incident number from store event: {event}",
-                event=loggerEvent,
-            )
+            if incidentNumber is None:
+                self.log.critical(
+                    "Unable to determine incident number from store event: "
+                    "{event}",
+                    event=loggerEvent,
+                )
+                return
 
             message = dict(incident_number=incidentNumber)
 
@@ -125,7 +128,7 @@ def _transmogrify(self, loggerEvent):
             return
 
         eventSourceEvent = Event(
-            # FIXME: add ID
+            eventID=eventID,
             eventClass=eventClass.__name__,
             message=textFromJSON(message),
         )
@@ -147,19 +150,20 @@ def _playback(self, listener, lastEventID):
                 listener.write(event.render().encode("utf-8"))
 
 
-    def _publish(self, eventSourceEvent):
+    def _publish(self, eventSourceEvent, eventID):
         eventText = eventSourceEvent.render().encode("utf-8")
 
         for listener in self._listeners:
             listener.write(eventText)
 
-        self._counter += 1
         self._events.append((self._counter, eventSourceEvent))
 
 
     def __call__(self, event):
-        eventSourceEvent = self._transmogrify(event)
+        self._counter += 1
+
+        eventSourceEvent = self._transmogrify(event, self._counter)
         if eventSourceEvent is None:
             return
 
-        self._publish(eventSourceEvent)
+        self._publish(eventSourceEvent, self._counter)