From: Scott Gasch <scott@gasch.org>
Date: Fri, 9 Dec 2022 21:10:20 +0000 (-0800)
Subject: Improve identifier for zookeeper based lockfiles.
X-Git-Url: https://wannabe.guru.org/gitweb/?a=commitdiff_plain;h=f3173f6a537d77bbf1178d467b9f74bfe7765817;p=pyutils.git

Improve identifier for zookeeper based lockfiles.
---

diff --git a/src/pyutils/files/lockfile.py b/src/pyutils/files/lockfile.py
index 26adfb3..158a636 100644
--- a/src/pyutils/files/lockfile.py
+++ b/src/pyutils/files/lockfile.py
@@ -26,6 +26,7 @@ import datetime
 import json
 import logging
 import os
+import platform
 import signal
 import sys
 import warnings
@@ -149,11 +150,14 @@ class LockFile(contextlib.AbstractContextManager):
 
     def _try_acquire_zk_lock(self) -> bool:
         assert self.expiration_timestamp
+        identifier = f"Lockfile for pid={os.getpid()} on machine {platform.node()}"
+        if self.override_command:
+            identifier += f" running {self.override_command}"
         self.zk_lease = zookeeper.RenewableReleasableLease(
             self.zk_client,
             self.lockfile,
             datetime.timedelta(seconds=self.expiration_timestamp),
-            f"Pyutils lockfile pid={os.getpid()}",
+            identifier,
         )
         return self.zk_lease