Messages queue is now use to execute events

consumer.py

@@ -24,7 +24,63 @@ import sys
 from message import Message
 from response import Response
 
+class MessageConsumer:
+    """Store a message before treating"""
+    def __init__(self, srv, raw, time, prvt, data):
+        self.srv = srv
+        self.raw = raw
+        self.time = time
+        self.prvt = prvt
+        self.data = data
+
+    def run(self):
+        # Create, parse and treat the message
+        try:
+            msg = Message(self.srv, self.raw, self.time, self.prvt)
+            res = msg.treat()
+        except:
+            print ("\033[1;31mERROR:\033[0m occurred during the "
+                   "processing of the message: %s" % self.raw)
+            exc_type, exc_value, exc_traceback = sys.exc_info()
+            traceback.print_exception(exc_type, exc_value,
+                                      exc_traceback)
+            return
+
+        # Send message
+        if res is not None:
+            if isinstance(res, list):
+                for r in res:
+                    if isinstance(r, Response):
+                        self.srv.send_response(r, self.data)
+            elif isinstance(res, Response):
+                self.srv.send_response(res, self.data)
+                
+        # Inform that the message has been treated
+        self.srv.msg_treated(self.data)
+        
+
+class EventConsumer:
+    """Store a event before treating"""
+    def __init__(self, context, evt, timeout=20):
+        self.context = context
+        self.evt = evt
+        self.timeout = timeout
+
+    def run(self):
+        try:
+            self.evt.launch_check()
+        except:
+            print ("\033[1;31mError:.\033[0 during event end")
+            exc_type, exc_value, exc_traceback = sys.exc_info()
+            sys.stderr.write (traceback.format_exception_only(exc_type,
+                                                              exc_value)[0])
+        if self.evt.next is not None:
+            self.context.add_event(self.evt, self.evt.id)
+        
+        
+
 class Consumer(threading.Thread):
+    """Dequeue and exec requested action"""
     def __init__(self, context):
         self.context = context
         self.stop = False
@@ -33,33 +89,10 @@ class Consumer(threading.Thread):
     def run(self):
         try:
             while not self.stop:
-                (srv, raw, time, prvt, data) = self.context.msg_queue.get(True, 20)
-
-                # Create, parse and treat the message
-                try:
-                    msg = Message(srv, raw, time, prvt)
-                    res = msg.treat()
-                except:
-                    print ("\033[1;31mERROR:\033[0m occurred during the "
-                           "processing of the message: %s" % raw)
-                    exc_type, exc_value, exc_traceback = sys.exc_info()
-                    traceback.print_exception(exc_type, exc_value,
-                                              exc_traceback)
-                    return
-
-                # Send message
-                if res is not None:
-                    if isinstance(res, list):
-                        for r in res:
-                            if isinstance(r, Response):
-                                srv.send_response(r, data)
-                    elif isinstance(res, Response):
-                        srv.send_response(res, data)
-
-                # Inform that the message has been treated
-                srv.msg_treated(data)
+                stm = self.context.cnsr_queue.get(True, 20)
+                stm.run()
 
         except queue.Empty:
             pass
         finally:
-            self.context.msg_thrd_size -= 2
+            self.context.cnsr_thrd_size -= 2