Fixed store in dataTransferApi

APIs/dataTransferAPI.py

@@ -420,12 +420,13 @@ class dataTransfer():
         payload           = dataObject[1]
 
 
-        if type(payloadMetadata) is not dict or type(payload) is not list:
+        if type(payloadMetadata) is not dict:
             raise FormatError("payload: Wrong input format in 'store'")
 
         #save all chunks to file
         while True:
 
+            #TODO check if payload != cPickle.dumps(None) ?
             if payloadMetadata and payload:
                 #append to file
                 try:
@@ -458,8 +459,6 @@ class dataTransfer():
 
     def __appendChunksToFile (self, targetBasePath, configDict, payload):
 
-        chunkCount         = len(payload)
-
         #generate target filepath
         targetFilepath = self.generateTargetFilepath(targetBasePath, configDict)
         self.log.debug("new file is going to be created at: " + targetFilepath)
@@ -492,8 +491,7 @@ class dataTransfer():
         #only write data if a payload exist
         try:
             if payload != None:
-                for chunk in payload:
-                    newFile.write(chunk)
+                newFile.write(payload)
             newFile.close()
         except:
             self.log.error("Unable to append data to file.")

conf/dataReceiver.conf

 # Where incoming data will be stored to
-targetDir         = /space/projects/zeromq-data-transfer/data/target
+targetDir         = /space/projects/zeromq-data-transfer/data/zmq_target
 
 # Local IP to connect dataStream to
 dataStreamIp      = 131.169.185.121     ;# zitpcx19282.desy.de

src/receiver/DataReceiver.py

@@ -104,14 +104,15 @@ def argumentParsing():
 
 
 class DataReceiver:
-    def __init__(self, outputDir, dataIp, dataPort):
+    def __init__(self, targetDir, dataIp, dataPort):
 
-        self.outputDir = os.path.normpath(outputDir)
+        self.log            = self.getLogger()
+
+        self.targetDir = os.path.normpath(targetDir)
         self.dataIp    = dataIp
         self.dataPort  = dataPort
 
-        self.log            = self.getLogger()
-        self.log.debug("Init")
+        self.log.info("Writing to directory '" + self.targetDir + "'.")
 
         self.dataTransfer   = dataTransfer("stream", useLog = True)
 
@@ -146,7 +147,7 @@ class DataReceiver:
                 raise
 
             try:
-                self.dataTransfer.store(self.outputDir, [payloadMetadata, payload] )
+                self.dataTransfer.store(self.targetDir, [payloadMetadata, payload] )
             except KeyboardInterrupt:
                 return
             except: