ominfra 0.0.0.dev90__py3-none-any.whl → 0.0.0.dev91__py3-none-any.whl

ominfra/{clouds/aws/journald2aws/threadworker.py → threadworker.py}

@@ -1,4 +1,10 @@
 # ruff: noqa: UP007
+# @omlish-lite
+"""
+TODO:
+ - implement stop lol
+ - collective heartbeat monitoring - ThreadWorkerGroups
+"""
 import abc
 import threading
 import time
@@ -59,6 +65,3 @@ class ThreadWorker(abc.ABC):
 
     def stop(self) -> None:
         raise NotImplementedError
-
-    def cleanup(self) -> None:  # noqa
-        pass

{ominfra-0.0.0.dev90.dist-info → ominfra-0.0.0.dev91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev90
+Version: 0.0.0.dev91
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
-Requires-Python: ~=3.12
+Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev ==0.0.0.dev90
-Requires-Dist: omlish ==0.0.0.dev90
+Requires-Dist: omdev ==0.0.0.dev91
+Requires-Dist: omlish ==0.0.0.dev91
 Provides-Extra: all
 Requires-Dist: paramiko ~=3.5 ; extra == 'all'
 Requires-Dist: asyncssh ~=2.18 ; extra == 'all'

{ominfra-0.0.0.dev90.dist-info → ominfra-0.0.0.dev91.dist-info}/RECORD

@@ -3,21 +3,17 @@ ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
 ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
+ominfra/threadworker.py,sha256=8rnWvgKjPIAdctS6wxiUiEIzm-mORRkWVD94YghVj0g,1413
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__main__.py,sha256=HXMoxEl9KHhv6zOOPQxiJAftfR2SjBqeVTYw-og9aFw,163
 ominfra/clouds/aws/auth.py,sha256=p50hnm8SU4CWAkLX0C4XCTAm7yAAg-HqcP1YvL5cW94,6205
 ominfra/clouds/aws/cli.py,sha256=OJVVLIwSy1378drkgP1ke_JltbyzBmnrB_Lom6A83os,510
 ominfra/clouds/aws/dataclasses.py,sha256=rKhtJKJ0JhMssU9n9CABX_JaUiokIboEATJ9TZgZQ6A,3868
-ominfra/clouds/aws/logs.py,sha256=VIT1fQazuaVSOfIlIcA9IxGT0Bqb69dbqcnbaTMEvSE,5185
+ominfra/clouds/aws/logs.py,sha256=7Cl9vjco6G-5wW06TmuzU9GZ-diFP8V26X2UZnfJD3U,5232
 ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViutQ,2767
 ominfra/clouds/aws/journald2aws/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/clouds/aws/journald2aws/main.py,sha256=LIDVHMVl0FmQGYKxdR78bhM1s5GOyY1VYDUH96FvVvY,8510
-ominfra/clouds/aws/journald2aws/threadworker.py,sha256=JFOrfBmDxQKCwk13qJ8-Zs8fxueMpHu0qRTEssdI7J0,1359
-ominfra/clouds/aws/journald2aws/journald/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/clouds/aws/journald2aws/journald/genmessages.py,sha256=3lB3W_Xl4GLAutNu1KvihdtMvkkukYqrfsamcqOS204,1583
-ominfra/clouds/aws/journald2aws/journald/messages.py,sha256=YBU7mbMtqnuamQKM-fGoraJNlbfzf-c1g8bC0ATSnt4,1975
-ominfra/clouds/aws/journald2aws/journald/tailer.py,sha256=XldM5QCZovJkfcot5hByj9Jq-F8sAptx65IPmrMo8b4,3042
+ominfra/clouds/aws/journald2aws/main.py,sha256=6Et4NVf4MY8_8wOIw8tpEnAJhmsy2BhS1vA3-_JFe9E,9108
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/deploy/_executor.py,sha256=zHn4zAz6Ch1i5R_EdKTfJv_4SE0QPNuQEk7O1ptB_7A,32834
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
@@ -45,6 +41,10 @@ ominfra/deploy/poly/runtime.py,sha256=G66AI-a27Wi6QYpG3M0ryqI7c5MnJkXt-_j9Qi8UiU
 ominfra/deploy/poly/site.py,sha256=QJwDDJoVm2-kxi4bxIrp-mn4y2qDLuW3CAUax3W8gv8,239
 ominfra/deploy/poly/supervisor.py,sha256=zkl6VQBcAZaMAhyR9DbbbqULcgFCDZoe9S_vP-mMFQ8,2289
 ominfra/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1552
+ominfra/journald/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/journald/genmessages.py,sha256=3lB3W_Xl4GLAutNu1KvihdtMvkkukYqrfsamcqOS204,1583
+ominfra/journald/messages.py,sha256=2iMY4k63XGNcN3LPvBmmK55ftjupnNh8f_ijlW9mkhQ,2208
+ominfra/journald/tailer.py,sha256=4CzBTQcAzlW9OQ--61fIdClZVgbMQQnYe2OD1d5P7e4,36780
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,7 +52,7 @@ ominfra/pyremote/_runcommands.py,sha256=2UVHaUJjmWP8jMZE79j2Qk1E5IOyVV1qNSUbdr-z
 ominfra/pyremote/bootstrap.py,sha256=RvMO3YGaN1E4sgUi1JEtiPak8cjvqtc_vRCq1yqbeZg,3370
 ominfra/pyremote/runcommands.py,sha256=bviS0_TDIoZVAe4h-_iavbvJtVSFu8lnk7fQ5iasCWE,1571
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=i6IrOGXiRxX08EuYIiYHOElN-ulC_TSnh1Ac2WQy8Zg,56190
+ominfra/scripts/journald2aws.py,sha256=Tvslp_Xe8GqCO2QBNiuMU52vIs-O0S5kpHJPIYma6_w,91385
 ominfra/scripts/supervisor.py,sha256=EU989AXWM-QJF4BmvKSlxkkBvRR3n2rz6yeXhjzo100,106149
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=usW9jjq5JPe_2SL8H5PrjDdksO75MX85Ir0HFfb35eM,72
@@ -72,9 +72,9 @@ ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev90.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev90.dist-info/METADATA,sha256=TzmuouBJtC_YaPWaqdaGBHF3XcVqFA-KyI58mxAabCA,739
-ominfra-0.0.0.dev90.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-ominfra-0.0.0.dev90.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev90.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev90.dist-info/RECORD,,
+ominfra-0.0.0.dev91.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev91.dist-info/METADATA,sha256=R5KW9-xUh5mTaXSsnUIHXvf_-txxmoEIj7bqvo0HhKk,739
+ominfra-0.0.0.dev91.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ominfra-0.0.0.dev91.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev91.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev91.dist-info/RECORD,,

ominfra/clouds/aws/journald2aws/journald/__init__.py

@@ -1 +0,0 @@
-# @omlish-lite

ominfra/clouds/aws/journald2aws/journald/tailer.py

@@ -1,108 +0,0 @@
-# ruff: noqa: UP007
-import fcntl
-import os.path
-import queue  # noqa
-import subprocess
-import time
-import typing as ta
-
-from omlish.lite.cached import cached_nullary
-from omlish.lite.check import check_not_none
-from omlish.lite.logs import log
-from omlish.lite.subprocesses import subprocess_shell_wrap_exec
-
-from ..threadworker import ThreadWorker
-from .messages import JournalctlMessage  # noqa
-from .messages import JournalctlMessageBuilder
-
-
-class JournalctlTailerWorker(ThreadWorker):
-    DEFAULT_CMD: ta.ClassVar[ta.Sequence[str]] = ['journalctl']
-
-    def __init__(
-            self,
-            output,  # type: queue.Queue[ta.Sequence[JournalctlMessage]]
-            *,
-            since: ta.Optional[str] = None,
-            after_cursor: ta.Optional[str] = None,
-
-            cmd: ta.Optional[ta.Sequence[str]] = None,
-            shell_wrap: bool = False,
-
-            read_size: int = 0x4000,
-            sleep_s: float = 1.,
-
-            **kwargs: ta.Any,
-    ) -> None:
-        super().__init__(**kwargs)
-
-        self._output = output
-
-        self._since = since
-        self._after_cursor = after_cursor
-
-        self._cmd = cmd or self.DEFAULT_CMD
-        self._shell_wrap = shell_wrap
-
-        self._read_size = read_size
-        self._sleep_s = sleep_s
-
-        self._mb = JournalctlMessageBuilder()
-
-        self._proc: ta.Optional[subprocess.Popen] = None
-
-    @cached_nullary
-    def _full_cmd(self) -> ta.Sequence[str]:
-        cmd = [
-            *self._cmd,
-            '--output', 'json',
-            '--show-cursor',
-            '--follow',
-        ]
-
-        if self._since is not None:
-            cmd.extend(['--since', self._since])
-
-        if self._after_cursor is not None:
-            cmd.extend(['--after-cursor', self._after_cursor])
-
-        if self._shell_wrap:
-            cmd = list(subprocess_shell_wrap_exec(*cmd))
-
-        return cmd
-
-    def _run(self) -> None:
-        with subprocess.Popen(
-            self._full_cmd(),
-            stdout=subprocess.PIPE,
-        ) as self._proc:
-            stdout = check_not_none(self._proc.stdout)
-
-            fd = stdout.fileno()
-            fl = fcntl.fcntl(fd, fcntl.F_GETFL)
-            fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-
-            while True:
-                if not self._heartbeat():
-                    break
-
-                while stdout.readable():
-                    if not self._heartbeat():
-                        break
-
-                    buf = stdout.read(self._read_size)
-                    if not buf:
-                        log.debug('Journalctl empty read')
-                        break
-
-                    log.debug('Journalctl read buffer: %r', buf)
-                    msgs = self._mb.feed(buf)
-                    if msgs:
-                        self._output.put(msgs)
-
-                if self._proc.poll() is not None:
-                    log.critical('Journalctl process terminated')
-                    break
-
-                log.debug('Journalctl readable')
-                time.sleep(self._sleep_s)