X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdaklog.py;h=a698cbc53fc5d754fb3ec2392aab73b299c3e1eb;hb=391f5ec09a119131dc846b796ca791f4cecc69e4;hp=856dc84103b385f5be41f799c3543ad8ad433d3b;hpb=e2baddaa67c0f22d42aff35dde78f09c72ab63a5;p=dak.git

diff --git a/daklib/daklog.py b/daklib/daklog.py
index 856dc841..a698cbc5 100644
--- a/daklib/daklog.py
+++ b/daklib/daklog.py
@@ -24,6 +24,7 @@ Logging functions
 
 ################################################################################
 
+import fcntl
 import os
 import pwd
 import time
@@ -36,34 +37,26 @@ class Logger(object):
     "Logger object"
     __shared_state = {}
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, program='unknown', debug=False, print_starting=True, include_pid=False):
         self.__dict__ = self.__shared_state
 
-        if not getattr(self, 'initialised', False):
-            from daklib.config import Config
-            self.initialised = True
-
-            # To be backwards compatibile, dump the first argument if it's a
-            # Config object.  TODO: Fix up all callers and remove this
-            if len(args) > 0 and isinstance(args[0], Config):
-                args = list(args)
-                args.pop(0)
-
-            self.__setup(*args, **kwargs)
-
-
-    def __setup(self, program='unknown', debug=False, print_starting=True, include_pid=False):
-        "Initialize a new Logger object"
         self.program = program
         self.debug = debug
         self.include_pid = include_pid
 
+        if not getattr(self, 'logfile', None):
+            self._open_log(debug)
+
+        if print_starting:
+            self.log(["program start"])
+
+    def _open_log(self, debug):
         # Create the log directory if it doesn't exist
         from daklib.config import Config
         logdir = Config()["Dir::Log"]
         if not os.path.exists(logdir):
             umask = os.umask(00000)
-            os.makedirs(logdir, 02775)
+            os.makedirs(logdir, 0o2775)
             os.umask(umask)
 
         # Open the logfile
@@ -73,15 +66,12 @@ class Logger(object):
         if debug:
             logfile = sys.stderr
         else:
-            umask = os.umask(00002)
+            umask = os.umask(0o0002)
             logfile = utils.open_file(logfilename, 'a')
             os.umask(umask)
 
         self.logfile = logfile
 
-        if print_starting:
-            self.log(["program start"])
-
     def log (self, details):
         "Log an event"
         # Prepend timestamp, program name, and user name
@@ -91,13 +81,14 @@ class Logger(object):
         details.insert(0, timestamp)
         # Force the contents of the list to be string.join-able
         details = [ str(i) for i in details ]
+        fcntl.lockf(self.logfile, fcntl.LOCK_EX)
         # Write out the log in TSV
         self.logfile.write("|".join(details)+'\n')
         # Flush the output to enable tail-ing
         self.logfile.flush()
+        fcntl.lockf(self.logfile, fcntl.LOCK_UN)
 
     def close (self):
         "Close a Logger object"
         self.log(["program end"])
-        self.logfile.flush()
         self.logfile.close()