also set vsys to restart when the vsys.conf file is re-written.

[nodemanager.git] / tools.py

diff --git a/tools.py b/tools.py
index f41f981..776a8d4 100644 (file)
--- a/tools.py
+++ b/tools.py
@@ -6,6 +6,7 @@ import os
 import pwd
 import tempfile
 import threading
+import fcntl
 
 import logger
 
@@ -35,7 +36,8 @@ def daemon():
     os.umask(0)
     devnull = os.open(os.devnull, os.O_RDWR)
     os.dup2(devnull, 0)
-    crashlog = os.open('/root/nm.stderr', os.O_RDWR | os.O_APPEND | os.O_CREAT, 0644)
+    # xxx fixme - this is just to make sure that nothing gets stupidly lost - should use devnull
+    crashlog = os.open('/var/log/nm.daemon', os.O_RDWR | os.O_APPEND | os.O_CREAT, 0644)
     os.dup2(crashlog, 1)
     os.dup2(crashlog, 2)
 
@@ -88,3 +90,20 @@ def write_temp_file(do_write, mode=None, uidgid=None):
     try: do_write(f)
     finally: f.close()
     return temporary_filename
+
+
+class NMLock:
+    def __init__(self, file):
+        logger.log("Lock %s initialized." % file, 2)
+        self.fd = os.open(file, os.O_RDWR|os.O_CREAT, 0600)
+        flags = fcntl.fcntl(self.fd, fcntl.F_GETFD)
+        flags |= fcntl.FD_CLOEXEC
+        fcntl.fcntl(self.fd, fcntl.F_SETFD, flags)
+    def __del__(self):
+        os.close(self.fd)
+    def acquire(self):
+        logger.log("Lock acquired.", 2)
+        fcntl.lockf(self.fd, fcntl.LOCK_SH)
+    def release(self):
+        logger.log("Lock released.", 2)
+        fcntl.lockf(self.fd, fcntl.LOCK_UN)