Merge pull request #456 from frappe/mergify/bp/master/pr-365

Author: tanmoysrt

agent/base.py

@@ -36,7 +36,7 @@ def __init__(self):
         self.data: dict[str, str] = {}
 
         # internal
-        self._config_file_lock: filelock.SoftFileLock | None = None
+        self._config_file_lock: filelock.FileLock | None = None
 
     def __repr__(self):
         return f"{self.__class__.__name__}({self.name})"
@@ -206,7 +206,7 @@ def get_config(self, for_update: bool = False) -> dict:
         """
         if for_update:
             if not self._config_file_lock:
-                self._config_file_lock = filelock.SoftFileLock(self.config_file + ".lock")
+                self._config_file_lock = filelock.FileLock(self.config_file + ".lock")
             self._config_file_lock.acquire()
 
         with open(self.config_file, "r") as f:

agent/nfs_handler.py

@@ -28,7 +28,7 @@ def add_to_acl(
         os.makedirs(self.shared_directory, exist_ok=True)
         self.server.execute(f"chown -R frappe:frappe {self.shared_directory}")
 
-        lock = filelock.SoftFileLock(self.exports_file + ".lock")
+        lock = filelock.FileLock(self.exports_file + ".lock")
 
         with lock.acquire(timeout=10), open(self.exports_file, "a+") as f:
             f.write(f"{self.benches_directory} {secondary_server_private_ip}({self.options})\n")
@@ -41,7 +41,7 @@ def remove_from_acl(self, secondary_server_private_ip: str):
             f"{self.benches_directory} {secondary_server_private_ip}({self.options})",
         ]
         for line in remove_lines:
-            lock = filelock.SoftFileLock(self.exports_file + ".lock")
+            lock = filelock.FileLock(self.exports_file + ".lock")
             with lock.acquire(timeout=10):
                 self.server.execute(f"sed -i '\\|{line}|d' {self.exports_file}")