EventService.nextEvent() doesn't break when EventService.breakloop() is called

[tomgoff]

In src/emanesh/emanesh/events/eventservice.py, EventService.nextEvent() does not currently break when EventService.breakloop() is called. This is different than how EventService.loop() behaves and makes it difficult to gracefully interrupt a call to nextEvent().

One option could be something like the following patch (based on the develop branch), which also removes the unused 'running' variable:

--- a/src/emanesh/emanesh/events/eventservice.py
+++ b/src/emanesh/emanesh/events/eventservice.py
@@ -238,7 +238,6 @@ class EventService:
                     data,_ = self._socket.recvfrom(65535)

                     if not len(data):
-                        running = False
                         break

                     (length,) = struct.unpack_from("!H",data)
@@ -257,11 +256,13 @@ class EventService:
                                 event.sequenceNumber,
                                 tuple(events))

+                elif fd is self._readFd:
+                    break
+
                 elif fd is self._socketOTA:
                     data,_ = self._socketOTA.recvfrom(65535)

                     if not len(data):
-                        running = False
                         break

                     (headerLength,) = struct.unpack_from("!H",data)
@@ -283,6 +284,7 @@ class EventService:
                             otaHeader.sequenceNumber,
                             tuple(events))

+            return (None, None, tuple(events))

     def subscribe(self,eventId,callback):
         self._lock.acquire()

[sgalgano]

Thanks for the bug report and suggested patch. The committed fix also adds logic to handle socket read errors in a manner similar to loop().

Tested with:

#!/usr/bin/env python

import signal
from emanesh.events import EventService

service = EventService(("224.1.2.8",45703,'lo'),
                       ("224.1.2.8",45702,'lo'));

def handler(signum, frame):
    global service
    service.breakloop()

signal.signal(signal.SIGQUIT, handler)
signal.signal(signal.SIGINT, handler)

while True:
    UUID,seq,events = service.nextEvent()

    if len(events):
        print UUID, seq
    else:
        break