Skip to content
Snippets Groups Projects
Commit aff3a4c0 authored by Manuela Kuhn's avatar Manuela Kuhn
Browse files

New context is created in initiate

parent 1423c95b
No related branches found
No related tags found
No related merge requests found
...@@ -40,9 +40,6 @@ class dataTransfer(): ...@@ -40,9 +40,6 @@ class dataTransfer():
if context: if context:
self.context = context self.context = context
self.externalContext = True self.externalContext = True
else:
self.context = zmq.Context()
self.externalContext = False
self.signalHost = signalHost self.signalHost = signalHost
...@@ -79,6 +76,9 @@ class dataTransfer(): ...@@ -79,6 +76,9 @@ class dataTransfer():
self.stop() self.stop()
raise Excepition("Argument 'targets' must be list.") raise Excepition("Argument 'targets' must be list.")
if not self.context:
self.context = zmq.Context()
self.externalContext = False
signal = None signal = None
# Signal exchange # Signal exchange
...@@ -269,7 +269,7 @@ class dataTransfer(): ...@@ -269,7 +269,7 @@ class dataTransfer():
connectionStr = "tcp://" + socketIdToConnect connectionStr = "tcp://" + socketIdToConnect
try: try:
self.dataSocket.bind(connectionStr) self.dataSocket.bind(connectionStr)
self.log.info("Socket of type " + self.connectionType + " started (bind) for '" + connectionStr + "'") self.log.info("Data socket of type " + self.connectionType + " started (bind) for '" + connectionStr + "'")
except: except:
self.log.error("Failed to start Socket of type " + self.connectionType + " (bind): '" + connectionStr + "'", exc_info=True) self.log.error("Failed to start Socket of type " + self.connectionType + " (bind): '" + connectionStr + "'", exc_info=True)
...@@ -282,7 +282,7 @@ class dataTransfer(): ...@@ -282,7 +282,7 @@ class dataTransfer():
connectionStr = "tcp://" + self.signalHost + ":" + self.requestPort connectionStr = "tcp://" + self.signalHost + ":" + self.requestPort
try: try:
self.requestSocket.connect(connectionStr) self.requestSocket.connect(connectionStr)
self.log.info("Socket started (connect) for '" + connectionStr + "'") self.log.info("Request socket started (connect) for '" + connectionStr + "'")
except: except:
self.log.error("Failed to start Socket of type " + self.connectionType + " (connect): '" + connectionStr + "'", exc_info=True) self.log.error("Failed to start Socket of type " + self.connectionType + " (connect): '" + connectionStr + "'", exc_info=True)
...@@ -519,6 +519,9 @@ class dataTransfer(): ...@@ -519,6 +519,9 @@ class dataTransfer():
message = self.__sendSignal(signal) message = self.__sendSignal(signal)
#TODO need to check correctness of signal? #TODO need to check correctness of signal?
self.streamStarted = None
self.queryNextStarted = None
try: try:
if self.signalSocket: if self.signalSocket:
self.log.info("closing signalSocket...") self.log.info("closing signalSocket...")
......
...@@ -347,7 +347,9 @@ class SignalHandler(): ...@@ -347,7 +347,9 @@ class SignalHandler():
variList.append([]) variList.append([])
else: else:
# send error back to receiver # send error back to receiver
self.sendResponse("CONNECTION_ALREADY_OPEN") # self.sendResponse("CONNECTION_ALREADY_OPEN")
# "reopen" the connection and confirm to receiver
self.sendResponse(signal)
def __stopSignal(self, signal, socketIds, listToCheck, variList, correspList): def __stopSignal(self, signal, socketIds, listToCheck, variList, correspList):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment