diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2015-06-19 17:26:11 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2015-06-22 17:35:13 +0000 |
| commit | 68a82f29f1f74bac99ebc9d9264fcf39801ef453 (patch) | |
| tree | 81a7d3b59ce56c2da76cc4ab86e42c1a29fb65a5 | |
| parent | a0fabfc6885c9bcbe4d1b2c0d2e611ff6ad8d3bd (diff) | |
| download | oslo-concurrency-68a82f29f1f74bac99ebc9d9264fcf39801ef453.tar.gz | |
Ensure we 'join' on the timer watchdog thread
This object is just another thread and its cancel method
does not join on itself, so we should make sure that we do
to avoid leaving threads lying around.
Change-Id: I37e3170b58627dee93513ec222f9a55001389dad
| -rw-r--r-- | oslo_concurrency/watchdog.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/oslo_concurrency/watchdog.py b/oslo_concurrency/watchdog.py index 692e9ba..72b3680 100644 --- a/oslo_concurrency/watchdog.py +++ b/oslo_concurrency/watchdog.py @@ -67,3 +67,4 @@ def watch(logger, action, level=logging.DEBUG, after=5.0): yield finally: timer.cancel() + timer.join() |