Supress logging on console (if verbose not set)

src/DataManager.py

@@ -185,6 +185,8 @@ class DataManager():
         verbose             = arguments.verbose
         onScreen            = arguments.onScreen
 
+        self.extLogQueue    = False
+
         if logQueue:
             self.logQueue    = logQueue
             self.extLogQueue = True
@@ -206,6 +208,8 @@ class DataManager():
 
             self.logQueueListener.start()
 
+        # Create log and set handler to queue handle
+        self.log = self.getLogger(self.logQueue)
 
         self.comPort             = arguments.comPort
         self.whitelist           = arguments.whitelist
@@ -248,12 +252,12 @@ class DataManager():
         self.taskProviderPr   = None
         self.dataDispatcherPr = None
 
-        logging.info("Version: " + str(__version__))
+        self.log.info("Version: " + str(__version__))
 
         #create zmq context
         # there should be only one context in one process
         self.zmqContext = zmq.Context.instance()
-        logging.debug("Registering global ZMQ context")
+        self.log.debug("Registering global ZMQ context")
 
         self.run()
 
@@ -265,6 +269,7 @@ class DataManager():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("DataManager")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -273,33 +278,42 @@ class DataManager():
 
 
     def run(self):
-        logging.info("Start SignalHandler...")
+        self.log.info("Start SignalHandler...")
         self.signalHandlerPr = Process ( target = SignalHandler, args = (self.whitelist, self.comPort, self.requestFwPort, self.requestPort, self.logQueue) )
         self.signalHandlerPr.start()
-        logging.debug("Start SignalHandler...done")
+        self.log.debug("Start SignalHandler...done")
 
         # needed, because otherwise the requests for the first files are not forwarded properly
         time.sleep(0.5)
 
-        logging.info("Start TaskProvider...")
+        self.log.info("Start TaskProvider...")
         self.taskProviderPr = Process ( target = TaskProvider, args = (self.eventDetectorConfig, self.requestFwPort, self.routerPort, self.logQueue) )
         self.taskProviderPr.start()
-        logging.info("Start TaskProvider...done")
+        self.log.info("Start TaskProvider...done")
 
-        logging.info("Start DataDispatcher...")
+        self.log.info("Start DataDispatcher...")
         self.dataDispatcherPr = Process ( target = DataDispatcher, args = ( 1, self.routerPort, self.chunkSize, self.fixedStreamId, self.logQueue, self.localTarget) )
         self.dataDispatcherPr.start()
-        logging.info("Start DataDispatcher...done")
+        self.log.info("Start DataDispatcher...done")
 
 
     def stop(self):
-        self.signalHandlerPr.terminate()
-        self.taskProviderPr.terminate()
-        self.dataDispatcherPr.terminate()
+        if self.signalHandlerPr:
+            self.signalHandlerPr.terminate()
+            self.signalHandlerPr = None
+
+        if self.taskProviderPr:
+            self.taskProviderPr.terminate()
+            self.taskProviderPr = None
+
+        if self.dataDispatcherPr:
+            self.dataDispatcherPr.terminate()
+            self.dataDispatcherPr = None
 
-        if not self.extLogQueue:
+        if not self.extLogQueue and self.logQueueListener:
             self.logQueue.put_nowait(None)
             self.logQueueListener.stop()
+            self.logQueueListener = None
 
 
     def __exit__(self):
@@ -349,6 +363,7 @@ class Test_Receiver_Stream():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("Test_Receiver_Stream")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -435,44 +450,43 @@ if __name__ == '__main__':
         except:
             sender = None
 
-        i = 100
-        try:
-            if sender:
+        if sender:
+            time.sleep(0.5)
+            i = 100
+            try:
                 while i <= 105:
-                    time.sleep(0.5)
                     targetFile = targetFileBase + str(i) + ".cbf"
                     logging.debug("copy to " + targetFile)
-#                    call(["cp", sourceFile, targetFile])
                     copyfile(sourceFile, targetFile)
                     i += 1
 
                     time.sleep(1)
-        except Exception as e:
-            logging.error("Exception detected: " + str(e))
-        finally:
-            if sender:
-                sender.stop()
-            if test:
+            except Exception as e:
+                logging.error("Exception detected: " + str(e))
+            finally:
                 time.sleep(3)
                 testPr.terminate()
 
                 for number in range(100, i):
                     targetFile = targetFileBase + str(number) + ".cbf"
-                    logging.debug("remove " + targetFile)
                     try:
                         os.remove(targetFile)
+                        logging.debug("remove " + targetFile)
                     except:
                         pass
 
+                sender.stop()
                 logQueue.put_nowait(None)
                 logQueueListener.stop()
 
     else:
         sender = DataManager()
 
-        while True:
-            try:
+        try:
+            while True:
                 pass
-            except:
-                break
+        except:
+            pass
+        finally:
+            sender.stop()
 

src/sender/DataDispatcher.py

@@ -82,6 +82,7 @@ class DataDispatcher():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("DataDispatcher-" + str(self.id))
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -299,7 +300,6 @@ class DataDispatcher():
 
                 # streaming data
 
-                print "targets", targets
                 for target, prio in targets:
 
                     # send data to the data stream to store it in the storage system

src/sender/InotifyxDetector.py

@@ -130,6 +130,7 @@ class InotifyxDetector():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("inotifyDetector")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 

src/sender/SignalHandler.py

@@ -17,7 +17,6 @@ try:
 except:
     BASE_PATH = os.path.dirname ( os.path.dirname ( os.path.dirname ( os.path.realpath ( '__file__' ) )))
 #    BASE_PATH = os.path.dirname ( os.path.dirname ( os.path.dirname ( os.path.abspath ( sys.argv[0] ) )))
-print "Signal: BASE_PATH", BASE_PATH
 #SHARED_PATH = os.path.dirname ( os.path.dirname ( os.path.realpath ( __file__ ) ) ) + os.sep + "shared"
 SHARED_PATH = BASE_PATH + os.sep + "src" + os.sep + "shared"
 
@@ -88,6 +87,7 @@ class SignalHandler():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("SignalHandler")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -381,6 +381,7 @@ class requestPuller():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("requestPuller")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 

src/sender/TaskProvider.py

@@ -112,6 +112,7 @@ class TaskProvider():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("TaskProvider")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -239,6 +240,7 @@ class requestResponder():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("requestResponder")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 

src/sender/WatchdogDetector.py

@@ -74,6 +74,7 @@ class WatchdogEventHandler(PatternMatchingEventHandler):
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("WatchdogEventHandler-" + str(self.id))
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -201,6 +202,7 @@ class checkModTime(threading.Thread):
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("checkModTime")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)
 
@@ -317,6 +319,7 @@ class WatchdogDetector():
         # Create log and set handler to queue handle
         h = QueueHandler(queue) # Just the one handler needed
         logger = logging.getLogger("WatchdogDetector")
+        logger.propagate = False
         logger.addHandler(h)
         logger.setLevel(logging.DEBUG)