diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-02-28 23:31:38 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-02-28 23:31:38 +0100 |
| commit | d40bbc512fdf2f11584a57957d184b2d8137c2ba (patch) | |
| tree | 2add77c8d49d7e9faeec34b6373b34715e0ee877 /nova/utils.py | |
| parent | 0d3a1f9c7478ae3c4f042e1876d47359804e1973 (diff) | |
| parent | d5736e925f288462f6325130be0af49f0ace5884 (diff) | |
| download | nova-d40bbc512fdf2f11584a57957d184b2d8137c2ba.tar.gz nova-d40bbc512fdf2f11584a57957d184b2d8137c2ba.tar.xz nova-d40bbc512fdf2f11584a57957d184b2d8137c2ba.zip | |
Merge lock_path change.
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py index 1198c1360..7b004253d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -44,11 +44,13 @@ from eventlet.green import subprocess from nova import exception from nova.exception import ProcessExecutionError +from nova import flags from nova import log as logging LOG = logging.getLogger("nova.utils") TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" +FLAGS = flags.FLAGS def import_class(import_str): @@ -504,7 +506,8 @@ def loads(s): def synchronized(name): def wrap(f): def inner(*args, **kwargs): - lock = lockfile.FileLock('nova-%s.lock' % name) + lock = lockfile.FileLock(os.path.join(FLAGS.lock_path, + 'nova-%s.lock' % name)) with lock: return f(*args, **kwargs) return inner |