Destroy context instantly

APIs/dataTransferAPI.py

@@ -509,7 +509,7 @@ class dataTransfer():
         if not self.externalContext and self.context:
             try:
                 self.log.info("Closing ZMQ context...")
-                self.context.destroy()
+                self.context.destroy(0)
                 self.context = None
                 self.log.info("Closing ZMQ context...done.")
             except:

conf/dataManager.conf

@@ -9,9 +9,9 @@ localTarget        = /space/projects/zeromq-data-transfer/data/target
 #localTarget       = /gpfs
 
 # Type of event detector to use (options are: inotifyx, watchdog, zmq)
-#eventDetectorType  = InotifyxDetector
+eventDetectorType  = InotifyxDetector
 #eventDetectorType  = WatchdogDetector
-eventDetectorType  = ZmqDetector
+#eventDetectorType  = ZmqDetector
 # Event type of files to be monitored (options are: IN_CLOSE_WRITE, IN_MOVED_TO, ...)
 monitoredEventType = IN_CLOSE_WRITE
 #monitoredEventType  = IN_MOVED_TO
@@ -23,14 +23,14 @@ monitoredFormats   = [".tif", ".cbf"]
 timeTillClosed     = 2
 
 # Module with methods specifying how to get the data (options are "getFromFile", "getFromZmq")
-#dataFetcherType    = getFromFile
-dataFetcherType    = getFromZmq
+dataFetcherType    = getFromFile
+#dataFetcherType    = getFromZmq
 # If "getFromZmq" is specified as dataFetcherType is needs a port to listen to
 dataFetcherPort    = 50010
 
 
 # List of hosts allowed to connect
-whitelist          = ["localhost", "zitpcx19282", "zitpcx22614", "haspp11eval01", "it-hpc-cxi03"]
+whitelist          = ["localhost", "zitpcx19282", "zitpcx22614", "lsdma-lab04", "haspp11eval01", "it-hpc-cxi03"]
 #whitelist          = ["localhost", "haspp11eval01", "it-hpc-cxi03"]
 
 # Number of parallel data streams
@@ -38,7 +38,7 @@ whitelist          = ["localhost", "zitpcx19282", "zitpcx22614", "haspp11eval01"
 numberOfStreams    = 1
 
 # Enable ZMQ pipe into storage system (if set to False: the file is moved into the localTarget)
-useDataStream      = True
+useDataStream      = False
 # Fixed host to send the data to with highest priority
 fixedStreamHost    = zitpcx19282
 # Fixed Port to send the data to with highest priority

src/sender/DataDispatcher.py

@@ -227,7 +227,7 @@ class DataDispatcher():
         self.dataFetcher.clean(self.dataFetcherProp)
         if not self.extContext and self.context:
             self.log.debug("Destroying context")
-            self.context.destroy()
+            self.context.destroy(0)
             self.context = None
 
 

src/sender/SignalHandler.py

@@ -183,6 +183,8 @@ class SignalHandler():
                 if checkStatus:
                     self.reactToSignal(signal, target)
 
+                continue
+
             if self.requestSocket in socks and socks[self.requestSocket] == zmq.POLLIN:
                 self.log.debug("")
                 self.log.debug("!!!! requestSocket !!!!")
@@ -219,7 +221,7 @@ class SignalHandler():
                 else:
                     self.log.debug("Version are not compatible")
                     self.sendResponse("VERSION_CONFLICT")
-                    return False, None, None, None
+                    return False, None, None
 
             if signal and host:
 
@@ -232,7 +234,7 @@ class SignalHandler():
                     self.log.debug("One of the hosts is not allowed to connect.")
                     self.log.debug("hosts: " + str(host))
                     self.sendResponse("NO_VALID_HOST")
-                    return False, None, None, None
+                    return False, None, None
 
         return True, signal, target
 
@@ -361,7 +363,7 @@ class SignalHandler():
             self.requestSocket.close(0)
             self.requestSocket = None
         if not self.extContext and self.context:
-            self.context.destroy()
+            self.context.destroy(0)
             self.context = None
 
 

src/sender/TaskProvider.py

@@ -184,7 +184,7 @@ class TaskProvider():
             self.requestFwSocket.close(0)
             self.requestFwSocket = None
         if not self.extContext and self.context:
-            self.context.destroy()
+            self.context.destroy(0)
             self.context = None
 
 

src/sender/eventDetectors/ZmqDetector.py

@@ -96,7 +96,7 @@ class EventDetector():
         if not self.externalContext and self.context:
             try:
                 self.log.info("Closing ZMQ context...")
-                self.context.destroy()
+                self.context.destroy(0)
                 self.context = None
                 self.log.info("Closing ZMQ context...done.")
             except: