Changed comments and names from thread to process

src/ZeroMQTunnel/sender.py

@@ -36,8 +36,8 @@ class WorkerProcess():
     dataStreamPort       = None
     zmqContextForWorker  = None
     zmqMessageChunkSize  = None
-    zmqCleanerIp         = None              # responsable to delete files
-    zmqCleanerPort       = None              # responsable to delete files
+    zmqCleanerIp         = None              # responsable to delete/move files
+    zmqCleanerPort       = None              # responsable to delete/move files
     zmqDataStreamSocket  = None
     routerSocket         = None
     cleanerSocket        = None
@@ -60,7 +60,7 @@ class WorkerProcess():
         self.log = self.getLogger()
 
 
-        self.log.debug("new workerThread started. id=" + str(self.id))
+        self.log.debug("new workerProcess started. id=" + str(self.id))
 
         # initialize sockets
         self.zmqDataStreamSocket      = self.zmqContextForWorker.socket(zmq.PUSH)
@@ -107,10 +107,10 @@ class WorkerProcess():
           -> the simulated "onClosed" event waits for a file for being
            not modified within a certain period of time.
            Instead of processing file after file the work will be
-           spreaded to many workerThreads. So each thread can wait
+           spreaded to many workerProcesses. So each process can wait
            individual periods of time for a file without blocking
            new file events - as new file events will be handled by
-           another workerThread.
+           another workerProcess.
         """
 
         """
@@ -136,7 +136,7 @@ class WorkerProcess():
             finished = workload == b"END"
             if finished:
                 processingJobs = False
-                self.log.debug("router requested to shutdown worker-thread. Worker processed: %d files" % jobCount)
+                self.log.debug("router requested to shutdown worker-process. Worker processed: %d files" % jobCount)
                 break
             jobCount += 1
 
@@ -429,8 +429,8 @@ class FileMover():
         self.poller.register(self.fileEventSocket, zmq.POLLIN)
         self.poller.register(self.receiverComSocket, zmq.POLLIN)
 
-        # setting up router for load-balancing worker-threads.
-        # each worker-thread will handle a file event
+        # setting up router for load-balancing worker-processes.
+        # each worker-process will handle a file event
         routerIp   = "127.0.0.1"
         routerPort = "50000"
 
@@ -468,21 +468,21 @@ class FileMover():
 
         incomingMessageCounter = 0
 
-        #start worker-threads. each will have its own PushSocket.
-        workerThreadList      = list()
-        numberOfWorkerThreads = parallelDataStreams
-        for threadNumber in range(numberOfWorkerThreads):
-            self.log.debug("instantiate new workerProcess (nr " + str(threadNumber) + " )")
-            newWorkerThread = Process(target=WorkerProcess, args=(threadNumber,
+        #start worker-processes. each will have its own PushSocket.
+        workerProcessList      = list()
+        numberOfWorkerProcesses = parallelDataStreams
+        for processNumber in range(numberOfWorkerProcesses):
+            self.log.debug("instantiate new workerProcess (nr " + str(processNumber) + " )")
+            newWorkerProcess = Process(target=WorkerProcess, args=(processNumber,
                                                                   self.dataStreamIp,
                                                                   self.dataStreamPort,
                                                                   self.chunkSize,
                                                                   self.zmqCleanerIp,
                                                                   self.zmqCleanerPort))
-            workerThreadList.append(newWorkerThread)
+            workerProcessList.append(newWorkerProcess)
 
-            self.log.debug("start worker process nr " + str(threadNumber))
-            newWorkerThread.start()
+            self.log.debug("start worker process nr " + str(processNumber))
+            newWorkerProcess.start()
 
         #run loop, and wait for incoming messages
         continueReceiving = True
@@ -529,22 +529,22 @@ class FileMover():
 
     def processFileEvent(self, fileEventMessage):
         # LRU worker is next waiting in the queue
-        self.log.debug("waiting for available workerThread.")
+        self.log.debug("waiting for available workerProcess.")
 
         # address == "worker-0"
         # empty   == ""
         # ready   == "READY"
         address, empty, ready = self.routerSocket.recv_multipart()
-        self.log.debug("available workerThread detected.")
+        self.log.debug("available workerProcess detected.")
 
-        self.log.debug("passing job to workerThread...")
+        self.log.debug("passing job to workerProcess...")
         self.routerSocket.send_multipart([
                                      address,
                                      b'',
                                      fileEventMessage,
                                     ])
 
-        self.log.debug("passing job to workerThread...done.")
+        self.log.debug("passing job to workerProcess...done.")
 
 
     def stop(self):
@@ -624,17 +624,17 @@ if __name__ == '__main__':
     zmqContext = zmq.Context.instance()
     logging.info("registering zmq global context")
 
-    logging.debug("start watcher thread...")
-    watcherThread = Process(target=DirectoryWatcher, args=(fileEventIp, watchFolder, fileEventPort, zmqContext))
-    logging.debug("watcher thread registered")
-    watcherThread.start()
-    logging.debug("start watcher thread...done")
+    logging.debug("start watcher process...")
+    watcherProcess = Process(target=DirectoryWatcher, args=(fileEventIp, watchFolder, fileEventPort, zmqContext))
+    logging.debug("watcher process registered")
+    watcherProcess.start()
+    logging.debug("start watcher process...done")
 
-    logging.debug("start cleaner thread...")
-    cleanerThread = Process(target=Cleaner, args=(cleanerTargetPath, zmqCleanerIp, zmqCleanerPort, zmqContext))
-    logging.debug("cleaner thread registered")
-    cleanerThread.start()
-    logging.debug("start cleaner thread...done")
+    logging.debug("start cleaner process...")
+    cleanerProcess = Process(target=Cleaner, args=(cleanerTargetPath, zmqCleanerIp, zmqCleanerPort, zmqContext))
+    logging.debug("cleaner process registered")
+    cleanerProcess.start()
+    logging.debug("start cleaner process...done")
 
     #start new fileMover
     fileMover = FileMover(fileEventIp, fileEventPort, dataStreamIp, dataStreamPort,
@@ -657,7 +657,7 @@ if __name__ == '__main__':
         logging.error(sys.exc_info())
         logging.error("shutting down zeromq...failed.")
 
-    # give the other threads time to close the sockets
+    # give the other processes time to close the sockets
     time.sleep(0.1)
     try:
         logging.debug("closing zmqContext...")