Changeset 688

Timestamp:

08/11/06 00:12:08 (18 years ago)

Author:

jerome

Message:

Now serializes accesses to the same device by different print queues
or print servers, just like PyKota.

Location:

tea4cups/trunk

Files:

• NEWS (modified) (1 diff)
• tea4cups (modified) (6 diffs)

tea4cups/trunk/NEWS

@@ -23 +23 @@
 Tea4CUPS News :
 
-  * 3.12 (2006-08-10) :
+  * 3.12 (2006-08-11) :
   
+    - Serializes accesses to the same device from different queues 
+      or print servers through file locking facilities (works over
+      NFS).
+    
     - Improved support for CUPS 1.2.x and higher.
     

tea4cups/trunk/tea4cups

@@ -83 +83 @@
 import signal
 import socket
+import fcntl
 import urllib2
 from struct import pack, unpack
 
-__version__ = "3.12alpha2_unofficial"
+__version__ = "3.12_unofficial"
 
 class TeeError(Exception):
@@ -909 +910 @@
         self.config = None
         self.conffile = None
-
+        self.LockFile = None
+
+    def waitForLock(self) :    
+        """Waits until we can acquire the lock file."""
+        self.logDebug("Waiting for lock...")
+        lockfilename = self.DeviceURI.replace("/", ".")
+        lockfilename = lockfilename.replace(":", ".")
+        lockfilename = lockfilename.replace("?", ".")
+        lockfilename = lockfilename.replace("&", ".")
+        lockfilename = lockfilename.replace("@", ".")
+        lockfilename = os.path.join(self.Directory, "%s-%s..LCK" % (self.myname, lockfilename))
+        stillrunning = True
+        while 1 :
+            self.LockFile = open(lockfilename, "a+")
+            fcntl.lockf(self.LockFile, fcntl.LOCK_EX) # Will wait until lock available
+            self.LockFile.seek(0, 0)      
+            try : 
+                oldpid = int(self.LockFile.readlines()[-1].strip())
+            except :    
+                stillrunning = False
+            else :    
+                try :
+                    os.kill(oldpid, 0)
+                except OSError :    
+                    stillrunning = False
+            if not stillrunning :        
+                self.LockFile.truncate(0)
+                self.LockFile.seek(0, 0)
+                self.LockFile.write("%s\n" % self.pid)
+                self.LockFile.flush()
+                break
+            else :    
+                time.sleep(0.1)
+        self.logDebug("Lock acquired.")
+        
     def readConfig(self) :
         """Reads the configuration file."""
@@ -1118 +1153 @@
             jbing = jbing[-1]
         (dummy, self.JobBilling) = jbing
-
-
+        
     def parseIPPRequestFile(self) :
         """Parses the IPP message file and returns a tuple (filename, parsedvalue)."""
@@ -1227 +1261 @@
     def cleanUp(self) :
         """Cleans up the place."""
+        self.logDebug("Cleaning up...")
         if (not isTrue(self.getPrintQueueOption(self.PrinterName, "keepfiles", ignore=1))) \
             and os.path.exists(self.DataFile) :
@@ -1233 +1268 @@
             except OSError, msg :    
                 self.logInfo("Problem when removing %s : %s" % (self.DataFile, msg), "error")
+        self.logDebug("Removing lock...")
+        try :
+            fcntl.flock(self.LockFile, fcntl.LOCK_UN)
+            self.LockFile.close()
+            # NB : we don't remove the lock file, since it might already be opened by another process.
+        except :    
+            self.logInfo("Problem while removing lock.", "error")
+        else :    
+            self.logDebug("Lock removed.")
+        self.logDebug("Clean.")
 
     def runBranches(self) :
@@ -1430 +1475 @@
                 wrapper.readConfig()
                 wrapper.initBackend()
+                wrapper.waitForLock()
                 wrapper.saveDatasAndCheckSum()
                 wrapper.exportAttributes()