revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Clear the timeout handler from the map once the execution is terminated

Browse source
This commit is contained in:
Fabio Manganiello 2019-01-13 22:58:18 +01:00
parent 2d8b2ba55a
commit 740063c23b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platypush/plugins/utils.py
View file

@ -59,12 +59,16 @@ class UtilsPlugin(Plugin):
return (None, return (None,
"A timeout named '{}' is already awaiting".format(name)) "A timeout named '{}' is already awaiting".format(name))
procedure = Procedure.build(name=name, requests=actions, _async=False) procedure = Procedure.build(name=name, requests=actions, _async=False)
self._pending_timeouts[name] = procedure self._pending_timeouts[name] = procedure
def _proc_wrapper(**kwargs): def _proc_wrapper(**kwargs):
procedure.execute(**kwargs) try:
procedure.execute(**kwargs)
finally:
with self._pending_timeouts_lock:
if name in self._pending_timeouts:
del self._pending_timeouts[name]
with self._pending_timeouts_lock: with self._pending_timeouts_lock:
self._pending_timeouts[name] = threading.Timer(seconds, self._pending_timeouts[name] = threading.Timer(seconds,
@ -78,6 +82,7 @@ class UtilsPlugin(Plugin):
with self._pending_timeouts_lock: with self._pending_timeouts_lock:
if name not in self._pending_timeouts: if name not in self._pending_timeouts:
self.logger.debug('{} is not a pending timeout'.format(name))
return return
timer = self._pending_timeouts.pop(name) timer = self._pending_timeouts.pop(name)
@ -138,6 +143,7 @@ class UtilsPlugin(Plugin):
with self._pending_intervals_lock: with self._pending_intervals_lock:
if name not in self._pending_intervals: if name not in self._pending_intervals:
self.logger.debug('{} is not a running interval'.format(name))
return return
del self._pending_intervals[name] del self._pending_intervals[name]