Commit 2020be52 authored by Manuela Kuhn's avatar Manuela Kuhn

Merge branch 'hotfix-2.3.2'

parents d712c936 a8ff4e18
# API to communicate with a data transfer unit
__version__ = '2.3.1'
__version__ = '2.3.2'
import zmq
import socket
......
Zeromq Data Transfer 2.3.1
- Fixed log rotation
Zeromq Data Transfer 2.3.1
- Fixed filename sending for requests (unicode problem)
- Fixed missing metadata if no target is specified
- Fixed parallel directory creation attempts
......
......@@ -184,7 +184,7 @@ def argumentParsing():
arguments.logfileName = arguments.logfileName or config.get('asection', 'logfileName')
if not helpers.isWindows():
arguments.logfileSize = arguments.logfileSize or config.get('asection', 'logfileSize')
arguments.logfileSize = arguments.logfileSize or config.getint('asection', 'logfileSize')
arguments.procname = arguments.procname or config.get('asection', 'procname')
......@@ -333,6 +333,7 @@ class DataManager():
# Get queue
self.logQueue = Queue(-1)
# Get the log Configuration for the lisener
if onScreen:
h1, h2 = helpers.getLogHandlers(logfile, logsize, verbose, onScreen)
......@@ -374,6 +375,9 @@ class DataManager():
self.controlSubConId = "tcp://{ip}:{port}".format(ip=self.localhost, port=arguments.controlSubPort)
self.requestFwConId = "tcp://{ip}:{port}".format(ip=self.localhost, port=arguments.requestFwPort)
self.routerConId = "tcp://{ip}:{port}".format(ip=self.localhost, port=arguments.routerPort)
eventDetConStr = "tcp://{ip}:{port}".format(ip=self.extIp, port=arguments.eventPort)
dataFetchConStr = "tcp://{ip}:{port}".format(ip=self.extIp, port=arguments.dataFetcherPort)
else:
self.log.info("Using ipc for internal communication.")
self.controlPubConId = "ipc://{path}/{pid}_{id}".format(path=self.ipcPath, pid=self.currentPID, id="controlPub")
......
__version__ = '2.3.1'
__version__ = '2.3.2'
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