Changed message format sent to OnDA

conf/sender.conf

 # Directory you want to monitor for changes
 # Inside this directory only the subdirectories "commissioning", "current" and "local" are monitored
-watchDir            = /space/projects/live-viewer/data/source/
+watchDir            = /rd_temp
 # Target to move the files into
-cleanerTargetPath   = /space/projects/live-viewer/data/target/
+cleanerTargetPath   = /gpfs/
 
 # Subdirectories of watchDir to be monitored
 monitoredSubdirs    = ["commissioning", "current", "local"]
@@ -14,7 +14,7 @@ monitoredFormats    = [".tif", ".cbf"]
 parallelDataStreams = 1
 
 # List of hosts allowed to connect to the sender
-receiverWhiteList   = ["zitpcx19282", "zitpcx22614", "lsdma-lab04" , "haspp11eval01" , "it-hpc-cxi04", "it-hpc-cxi03" ]
+receiverWhiteList   = ["haspp11eval01", "it-hpc-cxi03" ]
 
 # Enable ZMQ pipe into storage system (if set to False: the file is moved into the cleanerTargetPath)
 useDataStream       = False
@@ -40,7 +40,7 @@ receiverComIp       = 0.0.0.0
 receiverComPort     = 50000
 # Ports and ips to communicate with onda/realtime analysis
 # There needs to be one entry for each workerProcess (meaning stream)
-ondaIps             = ["127.0.0.1"]
+ondaIps             = ["0.0.0.0"]
 ondaPorts           = ["50200"]
 
 # Chunk size of file-parts getting send via zmq
@@ -48,7 +48,7 @@ chunkSize           = 10485760 ; # = 1024*1024*10
 #chunkSize           = 1073741824 ; # = 1024*1024*1024
 
 # Path where the logfile will be created
-logfilePath         = /space/projects/live-viewer/logs
+logfilePath         = /home/p11user/live-viewer/logs
 
 # Filename used for logging
 logfileName         = zmq_sender.log

src/copy_loop_cbf.sh

 #/bin/sh
 
-BASEPATH=/space/projects/live-viewer
-#BASEPATH=/home/p11user/live-viewer
+#BASEPATH=/space/projects/live-viewer
+BASEPATH=/home/p11user/live-viewer
 
 FILES=${BASEPATH}/test_015_00001.cbf
 #FILES=/tmp/PhilipPBS_3_00001.cbf
-TARGET=${BASEPATH}/data/source/local
-#TARGET=/rd/local/sender_test
+#TARGET=${BASEPATH}/data/source/local
+TARGET=/rd_temp/local/sender_test
 i=1
 LIMIT=1000
 while [ "$i" -le $LIMIT ]

src/sender/WorkerProcess.py

@@ -397,7 +397,7 @@ class WorkerProcess():
                 self.log.debug("Passing multipart-message for file " + str(sourceFilePathFull) + "...")
                 chunkNumber = 0
                 stillChunksToRead = True
-                payloadAll = []
+                payloadAll = [json.dumps(payloadMetadata.copy())]
                 while stillChunksToRead:
                     chunkNumber += 1
 
@@ -448,12 +448,12 @@ class WorkerProcess():
 
                 # self.liveViewerSocket.send_multipart(multipartMessage)
                 self.log.debug("Passing multipart-message for file " + str(sourceFilePathFull) + "...done.")
-            except zmq.error.Again:
-                self.log.error("unable to send multiplart-message for file " + str(sourceFilePathFull))
-                self.log.error("Receiver has disconnected")
+#            except zmq.error.Again:
+#                self.log.error("unable to send multiplart-message for file " + str(sourceFilePathFull))
+#                self.log.error("Receiver has disconnected")
             except Exception, e:
                 self.log.error("Unable to send multipart-message for file " + str(sourceFilePathFull))
-                self.log.debug("Error was: " + str(e))
+#                self.log.debug("Error was: " + str(e))
                 trace = traceback.format_exc()
                 self.log.debug("Error was: " + str(trace))
                 self.log.debug("Passing multipart-message...failed.")