diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-24 17:17:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-24 17:17:20 +0000 |
| commit | 5f5bc730495eb1191043cd01d21a925404220fe7 (patch) | |
| tree | a5a13309c5cdcb552fec17bd49df3812285da2fe | |
| parent | c7bf8ee26690f4a3365f6dbe2ace6589c4bbb424 (diff) | |
| parent | 68a82f29f1f74bac99ebc9d9264fcf39801ef453 (diff) | |
| download | oslo-concurrency-2.2.0.tar.gz | |
Merge "Ensure we 'join' on the timer watchdog thread"2.2.0
| -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() |