summaryrefslogtreecommitdiff
path: root/taskflow/conductors
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-15 16:46:23 +0000
committerGerrit Code Review <review@openstack.org>2015-06-15 16:46:23 +0000
commit35c006d69e461ce9e9e4fa44e6d99e85df997b1b (patch)
tree5b0dcc988e37e32df99788f5f9e07d84eb8610db /taskflow/conductors
parent6e6284252bcbb34682812d79849f73bc578eb477 (diff)
parentf1bd24fbe47cc0d8103ce5652b6952108de372f2 (diff)
downloadtaskflow-35c006d69e461ce9e9e4fa44e6d99e85df997b1b.tar.gz
Merge "Remove all 'lock_utils' now that fasteners provides equivalents"
Diffstat (limited to 'taskflow/conductors')
-rw-r--r--taskflow/conductors/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/taskflow/conductors/base.py b/taskflow/conductors/base.py
index 7a6b8ce..6e46fff 100644
--- a/taskflow/conductors/base.py
+++ b/taskflow/conductors/base.py
@@ -15,11 +15,11 @@
import abc
import threading
+import fasteners
import six
from taskflow import engines
from taskflow import exceptions as excp
-from taskflow.utils import lock_utils
@six.add_metaclass(abc.ABCMeta)
@@ -109,13 +109,13 @@ class Conductor(object):
# listener factories over the jobboard
return []
- @lock_utils.locked
+ @fasteners.locked
def connect(self):
"""Ensures the jobboard is connected (noop if it is already)."""
if not self._jobboard.connected:
self._jobboard.connect()
- @lock_utils.locked
+ @fasteners.locked
def close(self):
"""Closes the contained jobboard, disallowing further use."""
self._jobboard.close()