diff --git a/wlauto/external/daq_server/daqpower-1.0.4.tar.gz b/wlauto/external/daq_server/daqpower-1.0.4.tar.gz deleted file mode 100644 index 74dc91d4..00000000 Binary files a/wlauto/external/daq_server/daqpower-1.0.4.tar.gz and /dev/null differ diff --git a/wlauto/external/daq_server/daqpower-1.0.5.tar.gz b/wlauto/external/daq_server/daqpower-1.0.5.tar.gz new file mode 100644 index 00000000..3a519896 Binary files /dev/null and b/wlauto/external/daq_server/daqpower-1.0.5.tar.gz differ diff --git a/wlauto/external/daq_server/src/daqpower/__init__.py b/wlauto/external/daq_server/src/daqpower/__init__.py index 6019134e..86926b77 100644 --- a/wlauto/external/daq_server/src/daqpower/__init__.py +++ b/wlauto/external/daq_server/src/daqpower/__init__.py @@ -14,4 +14,4 @@ # -__version__ = '1.0.4' +__version__ = '1.0.5' diff --git a/wlauto/external/daq_server/src/daqpower/log.py b/wlauto/external/daq_server/src/daqpower/log.py index c9b215ae..0447f156 100644 --- a/wlauto/external/daq_server/src/daqpower/log.py +++ b/wlauto/external/daq_server/src/daqpower/log.py @@ -29,6 +29,11 @@ critical = lambda x: log.msg(x, logLevel=logging.CRITICAL) class CustomLoggingObserver(log.PythonLoggingObserver): + def __init__(self, loggerName="twisted"): + super(CustomLoggingObserver, self).__init__(loggerName) + if not hasattr(self, '_newObserver'): # new vesions of Twisted + self.logger = self._newObserver.logger # pylint: disable=no-member + def emit(self, eventDict): if 'logLevel' in eventDict: level = eventDict['logLevel']