Added paramters for realtime analysis to config-file

conf/config.py

@@ -44,12 +44,16 @@ class defaultConfigSender():
     # port number of dataStream-socket to push new files to
     dataStreamPort      = "6061"
     # zmq-pull-socket ip which deletes/moves given files
-    zmqCleanerIp        = LOCAL_IP
+    cleanerIp           = LOCAL_IP
     # zmq-pull-socket port which deletes/moves given files
-    zmqCleanerPort      = "6062"
+    cleanerPort         = "6062"
+    # port number to communicate with cleaner to get files for realtime analysis receiver
+    cleanerComPort      = "6063"
     # port number of dataStream-socket to receive signals from the receiver
     receiverComPort     = "6080"
 
+    # size of the ringbuffer used to store data for realtime analysis
+    maxRingBufferSize   = 10
     # chunk size of file-parts getting send via zmq
     chunkSize           = 1048576 # = 1024*1024
     #chunkSize           = 1073741824 # = 1024*1024*1024

src/sender.py

@@ -68,12 +68,13 @@ class Sender():
         self.dataStreamIp        = defConf.dataStreamIp
         self.dataStreamPort      = defConf.dataStreamPort
         self.cleanerTargetPath   = defConf.cleanerTargetPath
-        self.zmqCleanerIp        = defConf.zmqCleanerIp
-        self.zmqCleanerPort      = defConf.zmqCleanerPort
-        self.cleanerComPort      = "6063"
+        self.cleanerIp           = defConf.cleanerIp
+        self.cleanerPort         = defConf.cleanerPort
+        self.cleanerComPort      = defConf.cleanerComPort
         self.receiverComPort     = defConf.receiverComPort
         self.receiverWhiteList   = defConf.receiverWhiteList
 
+        self.maxRingBufferSize   = defConf.maxRingBufferSize
         self.parallelDataStreams = defConf.parallelDataStreams
         self.chunkSize           = defConf.chunkSize
 
@@ -98,7 +99,7 @@ class Sender():
         logging.debug("start watcher process...done")
 
         logging.debug("start cleaner process...")
-        cleanerProcess = Process(target=Cleaner, args=(self.cleanerTargetPath, self.zmqCleanerIp, self.zmqCleanerPort, self.cleanerComPort , 10, self.zmqContext))
+        cleanerProcess = Process(target=Cleaner, args=(self.cleanerTargetPath, self.cleanerIp, self.cleanerPort, self.cleanerComPort , self.maxRingBufferSize, self.zmqContext))
         logging.debug("cleaner process registered")
         cleanerProcess.start()
         logging.debug("start cleaner process...done")
@@ -111,7 +112,7 @@ class Sender():
         fileMover = FileMover(self.fileEventIp, self.fileEventPort, self.dataStreamIp, self.dataStreamPort,
                               self.receiverComPort, self.receiverWhiteList,
                               self.parallelDataStreams, self.chunkSize,
-                              self.zmqCleanerIp, self.zmqCleanerPort, self.cleanerComPort,
+                              self.cleanerIp, self.cleanerPort, self.cleanerComPort,
                               self.zmqContext)
         try:
             fileMover.process()