Fixed socket client and other bug fixes

abots/helpers/logging.py

@@ -67,10 +67,10 @@ class Logger:
                 rotated_date_format)
             rotated_handler = Rotated(*rotated_args)
             handlers.append(rotated_handler)
-        
+
         self.queue = Queue()
         self.queue_handler = QueueHandler(self.queue)
-        
+
         args = tuple(handlers)
         kwargs = dict()
         kwargs["respect_handler_level"] = True
@@ -85,15 +85,15 @@ class Logger:
 
     def debug(self, message):
         self.core.debug(message)
-        
+
     def info(self, message):
         self.core.info(message)
-        
+
     def warning(self, message):
         self.core.warning(message)
-        
+
     def error(self, message):
         self.core.error(message)
-        
+
     def critical(self, message):
-        self.core.critical(message)
+        self.core.critical(message)

abots/net/__init__.py

@@ -1,3 +1,4 @@
 from abots.net.socket_server import SocketServer
 from abots.net.socket_client import SocketClient
+from abots.net.prefix_socket_server import PrefixSocketServer
 from abots.net.prefix_socket_client import PrefixSocketClient

abots/net/socket_client.py

@@ -56,7 +56,7 @@ class SocketClient(Thread):
     def _send_event(self, message):
         self._events.put(jots(message))
         cast(self._bridge, "send", ("events", message))
-    
+
     def _prepare(self):
         self.sock.setblocking(False)
         self.sock.settimeout(1)
@@ -65,19 +65,20 @@ class SocketClient(Thread):
         except Exception as e:
             return True, e
         return False, None
-    
+
     def _obtain(self, queue_name, timeout=False):
         queue = self.queues[queue_name]
         if timeout is False:
             timeout = self.timeout
         while True:
             try:
-                if timeout is not None:
-                    message = queue.get(timeout=timeout)
-                else:
-                    message = queue.get_nowait()
+                #if timeout is not None:
+                #    message = queue.get(timeout=timeout)
+                #else:
+                #    message = queue.get_nowait()
+                message = queue.get_nowait()
                 yield message
-                cast(self._bridge, "send", (queue_name, message))
+                #cast(self._bridge, "send", (queue_name, message))
                 queue.task_done()
             except Empty:
                 break
@@ -150,9 +151,9 @@ class SocketClient(Thread):
         yield from self._obtain("outbox")
 
     def check(self):
-        for letter in self.recv():
-            if letter is not None and len(letter) > 0:
-                print(letter)
+        for message in self.recv():
+            if message is not None and len(message) > 0:
+                print(message)
 
     def send(self, message):
         self._inbox.put(message)

abots/net/socket_server.py

@@ -229,6 +229,11 @@ class SocketServer(Thread):
         letter = uuid, message
         self._inbox.put(letter)
 
+    def check(self):
+        for letter in self.recv():
+            if letter is not None and len(letter) > 0:
+                print(letter)
+
     # The function for running the socket server logic loop
     def run(self):
         err = self._prepare()