GitLab will be upgraded on June 23rd evening. During the upgrade the service will be unavailable, sorry for the inconvenience.

Commit a0a09861 authored by Operator for ID30's avatar Operator for ID30

Bug fix for default timeout=None, now forced to be 7200 s

parent fc455539
......@@ -55,6 +55,8 @@ class StopActor(object):
self.errorHandler.errorHandler.stopActor.trigger(inData)
def join(self, timeout=7200):
if timeout is None:
timeout = 7200
logger.debug('In {0}, parent {1}, before lock.acquire'.format(self.name, self.parent.name))
success = self.lock.acquire(timeout=timeout)
logger.debug('In {0}, parent {1}, after lock.acquire'.format(self.name, self.parent.name))
......
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