Commit 99825391 authored by Manuela Kuhn's avatar Manuela Kuhn
Browse files

Added check for necessary variables in TangoServer

parent 9d592c4d
......@@ -198,15 +198,15 @@ class ZmqDT():
# see, if all required params are there.
#
# if (self.detectorDevice
# and self.filewriterDevice
# # TODO replace TangoDevices with the following
# #and self.eigerIp
# and self.historySize
# and self.localTarget
# and self.storeData
# and self.removeData
# and self.whitelist ):
if (self.detectorDevice
and self.filewriterDevice
# TODO replace TangoDevices with the following
#and self.eigerIp
and self.historySize
and self.localTarget
and self.storeData
and self.removeData
and self.whitelist ):
#
# execute the start action ...
......@@ -223,7 +223,7 @@ class ZmqDT():
f.write("comPort = 50000" + "\n")
f.write("requestPort = 50001" + "\n")
# f.write("eventDetectorType = HttpDetector" + "\n")
# f.write("eventDetectorType = HttpDetector" + "\n")
f.write("eventDetectorType = InotifyxDetector" + "\n")
f.write("fixSubdirs = ['commissioning', 'current', 'local']" + "\n")
f.write("monitoredDir = /space/projects/zeromq-data-transfer/data/source" + "\n")
......@@ -233,7 +233,7 @@ class ZmqDT():
f.write("actionTime = 150" + "\n")
f.write("timeTillClosed = 2" + "\n")
# f.write("dataFetcherType = getFromHttp" + "\n")
# f.write("dataFetcherType = getFromHttp" + "\n")
f.write("dataFetcherType = getFromFile" + "\n")
f.write("chunkSize = 10485760" + "\n")
......@@ -256,9 +256,9 @@ class ZmqDT():
# python src/sender/DataManager.py --verbose --procname self.procname --detectorDevice self.detectorDevice --filewriterDevice self.filewriterDevice --historySize self.historySize --localTarget self.localTarget --storeData self.storeData --removeData self.removeData --whitelist self.whitelist
return "DONE"
# else:
# print "if failed"
# return "ERROR"
else:
print "if failed"
return "ERROR"
def stop (self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment