From d5736e925f288462f6325130be0af49f0ace5884 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Mon, 28 Feb 2011 23:31:09 +0100
Subject: Add a lock_path flag for lock files.

---
 nova/utils.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index cb1ea5a7d..48f12350f 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):
@@ -495,7 +497,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
-- 
cgit