mute verbose messages

Author: alievk

afy/predictor_remote.py

@@ -1,6 +1,6 @@
 from arguments import opt
 from networking import SerializingContext, check_connection
-from utils import Tee, TicToc, AccumDict, Once
+from utils import Logger, TicToc, AccumDict, Once
 
 import multiprocessing as mp
 import queue
@@ -25,7 +25,7 @@ def __init__(self, *args, in_addr=None, out_addr=None, **kwargs):
         self.out_addr = out_addr
         self.predictor_args = (args, kwargs)
         self.timing = AccumDict()
-        self.log = Tee('./var/log/predictor_remote.log')
+        self.log = Logger('./var/log/predictor_remote.log', verbose=opt.verbose)
 
         self.send_queue = mp.Queue(QUEUE_SIZE)
         self.recv_queue = mp.Queue(QUEUE_SIZE)
@@ -88,8 +88,7 @@ def _send_recv_async(self, method, args, critical):
             'id': self._i_msg
         }
 
-        if opt.verbose:
-            self.log("send", meta)
+        self.log("send", meta)
 
         if critical:
             self.send_queue.put((meta, data))
@@ -111,8 +110,7 @@ def _send_recv_async(self, method, args, critical):
                 self.log('recv_queue is empty')
                 return None
 
-        if opt.verbose:
-            self.log("recv", meta_recv)
+        self.log("recv", meta_recv)
 
         tt.tic()
         if meta_recv['name'] == 'predict':
@@ -128,7 +126,7 @@ def _send_recv_async(self, method, args, critical):
     @staticmethod
     def send_worker(address, send_queue, worker_alive):
         timing = AccumDict()
-        log = Tee('./var/log/send_worker.log')
+        log = Logger('./var/log/send_worker.log', opt.verbose)
 
         ctx = SerializingContext()
         sender = ctx.socket(zmq.PUSH)
@@ -163,7 +161,7 @@ def send_worker(address, send_queue, worker_alive):
     @staticmethod
     def recv_worker(address, recv_queue, worker_alive):
         timing = AccumDict()
-        log = Tee('./var/log/recv_worker.log')
+        log = Logger('./var/log/recv_worker.log')
 
         ctx = SerializingContext()
         receiver = ctx.socket(zmq.PULL)

afy/predictor_worker.py

@@ -1,7 +1,7 @@
 from predictor_local import PredictorLocal
 from arguments import opt
 from networking import SerializingContext, check_connection
-from utils import Tee, TicToc, AccumDict, Once
+from utils import Logger, TicToc, AccumDict, Once
 
 import cv2
 import numpy as np
@@ -58,14 +58,14 @@ def run(self):
     @staticmethod
     def recv_worker(port, recv_queue, worker_alive):
         timing = AccumDict()
-        log = Tee('./var/log/recv_worker.log')
+        log = Logger('./var/log/recv_worker.log', verbose=opt.verbose)
 
         ctx = SerializingContext()
         socket = ctx.socket(zmq.PULL)
         socket.bind(f"tcp://*:{port}")
         socket.RCVTIMEO = RECV_TIMEOUT
 
-        log(f'Receiving on port {port}')
+        log(f'Receiving on port {port}', important=True)
 
         try:
             while worker_alive.value:
@@ -92,17 +92,17 @@ def recv_worker(port, recv_queue, worker_alive):
 
                 Once(timing, log, per=1)
         except KeyboardInterrupt:
-            log("recv_worker: user interrupt")
+            log("recv_worker: user interrupt", important=True)
 
         worker_alive.value = 0
-        log("recv_worker exit")
+        log("recv_worker exit", important=True)
 
     @staticmethod
     def predictor_worker(recv_queue, send_queue, worker_alive):
         predictor = None
         predictor_args = ()
         timing = AccumDict()
-        log = Tee('./var/log/predictor_worker.log')
+        log = Logger('./var/log/predictor_worker.log', verbose=opt.verbose)
 
         try:
             while worker_alive.value:
@@ -129,7 +129,7 @@ def predictor_worker(recv_queue, send_queue, worker_alive):
                         args = msgpack.unpackb(data)
                     timing.add('UNPACK', tt.toc())
                 except ValueError:
-                    log("Invalid Message")
+                    log("Invalid Message", important=True)
                     continue
 
                 tt.tic()
@@ -142,7 +142,7 @@ def predictor_worker(recv_queue, send_queue, worker_alive):
                         del predictor
                         predictor_args = args
                         predictor = PredictorLocal(*predictor_args[0], **predictor_args[1])
-                        log("Initialized predictor with:", predictor_args)
+                        log("Initialized predictor with:", predictor_args, important=True)
                     result = True
                     tt.tic() # don't account for init
                 elif method['name'] == 'predict':
@@ -172,24 +172,24 @@ def predictor_worker(recv_queue, send_queue, worker_alive):
 
                 Once(timing, log, per=1)
         except KeyboardInterrupt:
-            log("predictor_worker: user interrupt")
+            log("predictor_worker: user interrupt", important=True)
         except Exception as e:
-            log("predictor_worker error")
+            log("predictor_worker error", important=True)
             traceback.print_exc()
 
         worker_alive.value = 0
-        log("predictor_worker exit")
+        log("predictor_worker exit", important=True)
 
     @staticmethod
     def send_worker(port, send_queue, worker_alive):
         timing = AccumDict()
-        log = Tee('./var/log/send_worker.log')
+        log = Logger('./var/log/send_worker.log', verbose=opt.verbose)
 
         ctx = SerializingContext()
         socket = ctx.socket(zmq.PUSH)
         socket.bind(f"tcp://*:{port}")
 
-        log(f'Sending on port {port}')
+        log(f'Sending on port {port}', important=True)
 
         try:
             while worker_alive.value:
@@ -215,10 +215,10 @@ def send_worker(port, send_queue, worker_alive):
 
                 Once(timing, log, per=1)
         except KeyboardInterrupt:
-            log("predictor_worker: user interrupt")
+            log("predictor_worker: user interrupt", important=True)
 
         worker_alive.value = 0
-        log("send_worker exit")
+        log("send_worker exit", important=True)
 
 
 def run_worker(in_port=None, out_port=None):

afy/utils.py

@@ -34,6 +34,18 @@ def flush(self):
         self.file.flush()
 
 
+class Logger():
+    def __init__(self, filename, verbose=True):
+        self.tee = Tee(filename)
+        self.verbose = verbose
+
+    def __call__(self, *args, important=False, **kwargs):
+        if not self.verbose and not important:
+            return
+
+        self.tee(*args, **kwargs)
+
+
 class Once():
     _id = {}