ominfra 0.0.0.dev245__py3-none-any.whl → 0.0.0.dev247__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -1946,6 +1946,7 @@ class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
 """
 TODO:
  - 'json pids', with code version? '.json.pid'? '.jpid'?
+  - json*L* pidfiles - first line is bare int, following may be json - now `head -n1 foo.pid` not cat
 """
 
 
@@ -2091,7 +2092,12 @@ class Pidfile:
 
     #
 
-    def write(self, pid: ta.Optional[int] = None) -> None:
+    def write(
+            self,
+            pid: ta.Optional[int] = None,
+            *,
+            suffix: ta.Optional[str] = None,
+    ) -> None:
         self.acquire_lock()
 
         if pid is None:
@@ -2099,7 +2105,11 @@ class Pidfile:
 
         self._f.seek(0)
         self._f.truncate()
-        self._f.write(f'{pid}\n')
+        self._f.write('\n'.join([
+            str(pid),
+            *([suffix] if suffix is not None else []),
+            '',
+        ]))
         self._f.flush()
 
     def clear(self) -> None:
@@ -2110,14 +2120,20 @@ class Pidfile:
 
     #
 
-    def read(self) -> ta.Optional[int]:
+    def read_raw(self) -> ta.Optional[str]:
         self.ensure_cannot_lock()
 
         self._f.seek(0)
         buf = self._f.read()
         if not buf:
             return None
-        return int(buf)
+        return buf
+
+    def read(self) -> ta.Optional[int]:
+        buf = self.read_raw()
+        if not buf:
+            return None
+        return int(buf.splitlines()[0].strip())
 
     def kill(self, sig: int = signal.SIGTERM) -> None:
         if (pid := self.read()) is None:

ominfra/scripts/supervisor.py

@@ -6849,6 +6849,22 @@ class LoggingHttpHandler(HttpHandler_):
         return resp
 
 
+@dc.dataclass(frozen=True)
+class ExceptionLoggingHttpHandler(HttpHandler_):
+    handler: HttpHandler
+    log: logging.Logger
+    message: ta.Union[str, ta.Callable[[HttpHandlerRequest, BaseException], str]] = 'Error in http handler'
+
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        try:
+            return self.handler(req)
+        except Exception as e:  # noqa
+            if callable(msg := self.message):
+                msg = msg(req, e)
+            self.log.exception(msg)
+            raise
+
+
 ##
 
 

{ominfra-0.0.0.dev245.dist-info → ominfra-0.0.0.dev247.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev245
+Version: 0.0.0.dev247
 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.dev245
-Requires-Dist: omlish==0.0.0.dev245
+Requires-Dist: omdev==0.0.0.dev247
+Requires-Dist: omlish==0.0.0.dev247
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev245.dist-info → ominfra-0.0.0.dev247.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=i1WBsTvVx8XetO_Kl0hGPHGDAFhPybyMBm60bvg_Hi8,167534
+ominfra/scripts/journald2aws.py,sha256=KDybsFOnwMboKRSTReml10Y6dw2LRH8FRlJ4ALnASlY,167994
 ominfra/scripts/manage.py,sha256=2uU_QU9C6s1DiLz9wV_zLkfWNZZ91MZHiCIjuKLqDJw,378202
-ominfra/scripts/supervisor.py,sha256=XQGNjIHFvyy7S5uv7bQ4hOne4hqWqny1SLcNlr1vX7w,296335
+ominfra/scripts/supervisor.py,sha256=Yp6as-xmawttOq6O69Dji3w4XNcWp9a5wpKqsQ33-pc,296866
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev245.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev245.dist-info/METADATA,sha256=1GnfkpJKOOzD_nHcXsYxTOvBVAX9d9BIDi-aywJ-Bhg,731
-ominfra-0.0.0.dev245.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-ominfra-0.0.0.dev245.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev245.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev245.dist-info/RECORD,,
+ominfra-0.0.0.dev247.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev247.dist-info/METADATA,sha256=ipU1cQanDAH5HyD-ISBZjVBDIcHbQbVlOr2yj60KUKU,731
+ominfra-0.0.0.dev247.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+ominfra-0.0.0.dev247.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev247.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev247.dist-info/RECORD,,