Update Event module + add destroy method for sockets

Author: dariusstefan

opensips/event/datagram.py

@@ -18,7 +18,7 @@
 ##
 
 import socket
-from .generic import GenericSocket
+from .generic_socket import GenericSocket
 
 class Datagram(GenericSocket):
     def __init__(self, **kwargs):
@@ -50,3 +50,7 @@ def handle(self, callback, stop):
                 callback(data)
             except BlockingIOError:
                 pass
+
+    def destroy(self):
+        self.sock.close()
+        self.sock = None

opensips/event/generic.py opensips/event/generic_socket.pyopensips/event/generic.py renamed to opensips/event/generic_socket.py

@@ -31,3 +31,7 @@ def create(self):
     @abstractmethod
     def handle(self, callback, stop):
         pass
+
+    @abstractmethod
+    def destroy(self):
+        pass

opensips/event/stream.py

@@ -18,7 +18,7 @@
 ##
 
 import socket
-from .generic import GenericSocket
+from .generic_socket import GenericSocket
 
 class Stream(GenericSocket):
     def __init__(self, **kwargs):
@@ -49,3 +49,7 @@ def handle(self, callback, stop):
                     callback(data)
             except BlockingIOError:
                 pass
+    
+    def destroy(self):
+        self.sock.close()
+        self.sock = None

opensips/event/subscriber.py

@@ -17,7 +17,7 @@
 ## along with this program. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from ..mi import MI, OpenSIPSMIException
+from ..mi import OpenSIPSMI, OpenSIPSMIException
 from .datagram import Datagram
 from .stream import Stream
 from threading import Thread, Event
@@ -26,7 +26,7 @@ class OpenSIPSEventException(Exception):
     pass
 
 class OpenSIPSEvent():
-    def __init__(self, mi: MI, type: str, **kwargs):
+    def __init__(self, mi: OpenSIPSMI, type: str, **kwargs):
         self.mi = mi
         self.kwargs = kwargs
 
@@ -65,9 +65,12 @@ def unsubscribe(self, event: str):
             if ret_val != "OK":
                 raise OpenSIPSEventException("Failed to unsubscribe from event")
 
+            self.stop()
+
         except OpenSIPSMIException as e:
             raise e
-        
+
     def stop(self):
         self.thread_stop.set()
         self.thread.join()
+        self.socket.destroy()