First stages integrating JackrabbitDLM for more advanced lock management.

Changes to be committed:
	modified:   .gitignore
	modified:   Base/LauncherLocker
	modified:   Base/Library/JRRsupport.py

Author: rapmd73

.gitignore

@@ -1,3 +1,3 @@
 *.pyc
 *.log
-Base/Library/dbcheck.py
+__pycache__

Base/LauncherLocker

@@ -3,13 +3,21 @@
 # Crontab entry ( without has mark #
 # @reboot ( /home/JackrabbitRelay2/Base/RelayLauncher & ) > /dev/null 2>&1
 
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
+
+e=`ps xa | egrep -c "JackrabbitDLM$"`
+if [[ $e -gt 0 ]] ; then
+    echo JackrabbitDLM loaded
+    exit 0
+fi
+
 BaseDir="/home/JackrabbitRelay2/Base"
 
 cd $BaseDir
 
 while true ; do
     $BaseDir/JackrabbitLocker
-    sleep 180
+    sleep 60
 done
 
 

Base/Library/JRRsupport.py

@@ -16,6 +16,13 @@
 import socket
 import json
 
+JRDLM=False
+if os.path.exists('/home/JackrabbitDLM/DLMLocker.py'):
+    sys.path.append('/home/JackrabbitDLM')
+    import DLMLocker as DLM
+    print("Using JackrabbitDLM")
+    JRDLM=True
+
 # Get the starting nice value to measure and control OS load.
 
 MasterNice=os.getpriority(os.PRIO_PROCESS,0)
@@ -380,6 +387,16 @@ def Put(self,expire,data):
     def Erase(self):
         return self.RetryData("Erase",0,None)
 
+# If the newer DLM is available, override the local Locker class.
+if JRDLM:
+    class NewLocker(DLM.Locker):
+        def __init__(self, filename, Retry=7, Timeout=300, Log=None, ID=None, **kwargs):
+            # Map the old internal signature to the new DLM signature
+            # Note: We ignore 'Log' as the new DLM handles its own output/stats
+            super().__init__(filename, Retry=Retry, Timeout=Timeout, ID=ID, **kwargs)
+
+    Locker = NewLocker
+
 ###
 ### General purpose functions
 ###