ominfra 0.0.0.dev226__tar.gz → 0.0.0.dev228__tar.gz

{ominfra-0.0.0.dev226/ominfra.egg-info → ominfra-0.0.0.dev228}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev226
+Version: 0.0.0.dev228
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev226
-Requires-Dist: omlish==0.0.0.dev226
+Requires-Dist: omdev==0.0.0.dev228
+Requires-Dist: omlish==0.0.0.dev228
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228}/ominfra/clouds/aws/journald2aws/driver.py

@@ -107,7 +107,7 @@ class JournalctlToAwsDriver(ExitStacked):
 
     def _ensure_locked(self) -> None:
         if (pf := self._pidfile()) is not None:
-            pf.ensure_locked()
+            pf.acquire_lock()
 
     #
 

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228}/ominfra/scripts/journald2aws.py

@@ -2048,7 +2048,7 @@ class Pidfile:
         del self._f
         return True
 
-    def try_lock(self) -> bool:
+    def try_acquire_lock(self) -> bool:
         try:
             fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
             return True
@@ -2056,14 +2056,29 @@ class Pidfile:
         except OSError:
             return False
 
-    def ensure_locked(self) -> None:
-        if not self.try_lock():
-            raise RuntimeError('Could not get lock')
+    #
+
+    class Error(Exception):
+        pass
+
+    class LockedError(Error):
+        pass
+
+    def acquire_lock(self) -> None:
+        if not self.try_acquire_lock():
+            raise self.LockedError
+
+    class NotLockedError(Error):
+        pass
+
+    def ensure_cannot_lock(self) -> None:
+        if self.try_acquire_lock():
+            raise self.NotLockedError
 
     #
 
     def write(self, pid: ta.Optional[int] = None) -> None:
-        self.ensure_locked()
+        self.acquire_lock()
 
         if pid is None:
             pid = os.getpid()
@@ -2074,20 +2089,25 @@ class Pidfile:
         self._f.flush()
 
     def clear(self) -> None:
-        self.ensure_locked()
+        self.acquire_lock()
 
         self._f.seek(0)
         self._f.truncate()
 
-    def read(self) -> int:
-        if self.try_lock():
-            raise RuntimeError('Got lock')
+    #
+
+    def read(self) -> ta.Optional[int]:
+        self.ensure_cannot_lock()
 
         self._f.seek(0)
-        return int(self._f.read())
+        buf = self._f.read()
+        if not buf:
+            return None
+        return int(buf)
 
     def kill(self, sig: int = signal.SIGTERM) -> None:
-        pid = self.read()
+        if (pid := self.read()) is None:
+            raise self.Error(f'Pidfile locked but empty')
         os.kill(pid, sig)
 
 
@@ -5044,7 +5064,7 @@ class JournalctlToAwsDriver(ExitStacked):
 
     def _ensure_locked(self) -> None:
         if (pf := self._pidfile()) is not None:
-            pf.ensure_locked()
+            pf.acquire_lock()
 
     #
 

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228}/ominfra/scripts/manage.py

@@ -3104,7 +3104,7 @@ class Timeout(abc.ABC):
 
     @classmethod
     def _now(cls) -> float:
-        return time.time()
+        return time.monotonic()
 
     #
 

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev226
+Version: 0.0.0.dev228
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev226
-Requires-Dist: omlish==0.0.0.dev226
+Requires-Dist: omdev==0.0.0.dev228
+Requires-Dist: omlish==0.0.0.dev228
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev226
-omlish==0.0.0.dev226
+omdev==0.0.0.dev228
+omlish==0.0.0.dev228
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev226 → ominfra-0.0.0.dev228}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev226'
+version = '0.0.0.dev228'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev226',
-    'omlish == 0.0.0.dev226',
+    'omdev == 0.0.0.dev228',
+    'omlish == 0.0.0.dev228',
 ]
 
 [project.optional-dependencies]