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

ominfra/supervisor/compat.py

@@ -32,9 +32,10 @@ def compact_traceback() -> ta.Tuple[
     types.TracebackType,
 ]:
     t, v, tb = sys.exc_info()
-    tbinfo = []
     if not tb:
         raise RuntimeError('No traceback')
+
+    tbinfo = []
     while tb:
         tbinfo.append((
             tb.tb_frame.f_code.co_filename,
@@ -72,6 +73,7 @@ def decode_wait_status(sts: int) -> ta.Tuple[int, str]:
     Return a tuple (exitstatus, message) where exitstatus is the exit status, or -1 if the process was killed by a
     signal; and message is a message telling what happened.  It is the caller's responsibility to display the message.
     """
+
     if os.WIFEXITED(sts):
         es = os.WEXITSTATUS(sts) & 0xffff
         msg = f'exit status {es}'
@@ -171,6 +173,7 @@ def real_exit(code: int) -> None:
 
 def get_path() -> ta.Sequence[str]:
     """Return a list corresponding to $PATH, or a default."""
+
     path = ['/bin', '/usr/bin', '/usr/local/bin']
     if 'PATH' in os.environ:
         p = os.environ['PATH']
@@ -187,8 +190,9 @@ ANSI_ESCAPE_BEGIN = b'\x1b['
 ANSI_TERMINATORS = (b'H', b'f', b'A', b'B', b'C', b'D', b'R', b's', b'u', b'J', b'K', b'h', b'l', b'p', b'm')
 
 
-def strip_escapes(s):
+def strip_escapes(s: bytes) -> bytes:
     """Remove all ANSI color escapes from the given string."""
+
     result = b''
     show = 1
     i = 0

ominfra/supervisor/configs.py

@@ -12,6 +12,59 @@ from .datatypes import logging_level
 from .datatypes import octal_type
 
 
+@dc.dataclass(frozen=True)
+class ProcessConfig:
+    name: str
+    command: str
+
+    uid: ta.Optional[int] = None
+    directory: ta.Optional[str] = None
+    umask: ta.Optional[int] = None
+    priority: int = 999
+
+    autostart: bool = True
+    autorestart: str = 'unexpected'
+
+    startsecs: int = 1
+    startretries: int = 3
+
+    numprocs: int = 1
+    numprocs_start: int = 0
+
+    @dc.dataclass(frozen=True)
+    class Log:
+        file: ta.Optional[str] = None
+        capture_maxbytes: ta.Optional[int] = None
+        events_enabled: bool = False
+        syslog: bool = False
+        backups: ta.Optional[int] = None
+        maxbytes: ta.Optional[int] = None
+
+    stdout: Log = Log()
+    stderr: Log = Log()
+
+    stopsignal: int = signal.SIGTERM
+    stopwaitsecs: int = 10
+    stopasgroup: bool = False
+
+    killasgroup: bool = False
+
+    exitcodes: ta.Sequence[int] = (0,)
+
+    redirect_stderr: bool = False
+
+    environment: ta.Optional[ta.Mapping[str, str]] = None
+
+
+@dc.dataclass(frozen=True)
+class ProcessGroupConfig:
+    name: str
+
+    priority: int = 999
+
+    processes: ta.Optional[ta.Sequence[ProcessConfig]] = None
+
+
 @dc.dataclass(frozen=True)
 class ServerConfig:
     user: ta.Optional[str] = None
@@ -31,7 +84,7 @@ class ServerConfig:
     strip_ansi: bool = False
     silent: bool = False
 
-    groups: ta.Optional[ta.Sequence['ProcessGroupConfig']] = None
+    groups: ta.Optional[ta.Sequence[ProcessGroupConfig]] = None
 
     @classmethod
     def new(
@@ -55,56 +108,3 @@ class ServerConfig:
             child_logdir=child_logdir if child_logdir else tempfile.gettempdir(),
             **kwargs,
         )
-
-
-@dc.dataclass(frozen=True)
-class ProcessGroupConfig:
-    name: str
-
-    priority: int = 999
-
-    processes: ta.Optional[ta.Sequence['ProcessConfig']] = None
-
-
-@dc.dataclass(frozen=True)
-class ProcessConfig:
-    name: str
-    command: str
-
-    uid: ta.Optional[int] = None
-    directory: ta.Optional[str] = None
-    umask: ta.Optional[int] = None
-    priority: int = 999
-
-    autostart: bool = True
-    autorestart: str = 'unexpected'
-
-    startsecs: int = 1
-    startretries: int = 3
-
-    numprocs: int = 1
-    numprocs_start: int = 0
-
-    @dc.dataclass(frozen=True)
-    class Log:
-        file: ta.Optional[str] = None
-        capture_maxbytes: ta.Optional[int] = None
-        events_enabled: bool = False
-        syslog: bool = False
-        backups: ta.Optional[int] = None
-        maxbytes: ta.Optional[int] = None
-
-    stdout: Log = Log()
-    stderr: Log = Log()
-
-    stopsignal: int = signal.SIGTERM
-    stopwaitsecs: int = 10
-    stopasgroup: bool = False
-
-    killasgroup: bool = False
-
-    exitcodes: ta.Iterable[int] = (0,)
-
-    redirect_stderr: bool = False
-
-    environment: ta.Optional[ta.Mapping[str, str]] = None

ominfra/supervisor/context.py

@@ -114,6 +114,7 @@ class ServerContext(AbstractServerContext):
         Set the uid of the supervisord process.  Called during supervisord startup only.  No return value.  Exits the
         process via usage() if privileges could not be dropped.
         """
+
         if self.uid is None:
             if os.getuid() == 0:
                 warnings.warn(
@@ -293,6 +294,7 @@ def drop_privileges(user: ta.Union[int, str, None]) -> ta.Optional[str]:
     and when spawning subprocesses.  Returns None on success or a string error message if privileges could not be
     dropped.
     """
+
     if user is None:
         return 'No user specified to setuid to!'
 

ominfra/supervisor/datatypes.py

@@ -151,15 +151,19 @@ SIGNUMS = [getattr(signal, k) for k in dir(signal) if k.startswith('SIG')]
 def signal_number(value: ta.Union[int, str]) -> int:
     try:
         num = int(value)
+
     except (ValueError, TypeError):
         name = value.strip().upper()  # type: ignore
         if not name.startswith('SIG'):
             name = f'SIG{name}'
+
         num = getattr(signal, name, None)  # type: ignore
         if num is None:
             raise ValueError(f'value {value!r} is not a valid signal name')  # noqa
+
     if num not in SIGNUMS:
         raise ValueError(f'value {value!r} is not a valid signal number')
+
     return num
 
 

ominfra/supervisor/dispatchers.py

@@ -93,7 +93,9 @@ class OutputDispatcher(Dispatcher):
 
         `event_type` should be one of ProcessLogStdoutEvent or ProcessLogStderrEvent
         """
+
         super().__init__(process, event_type.channel, fd)
+
         self.event_type = event_type
 
         self.lc: ProcessConfig.Log = getattr(process.config, self._channel)
@@ -107,25 +109,30 @@ class OutputDispatcher(Dispatcher):
         self._output_buffer = b''  # data waiting to be logged
 
         # all code below is purely for minor speedups
+
         begin_token = self.event_type.BEGIN_TOKEN
         end_token = self.event_type.END_TOKEN
-        self.begin_token_data = (begin_token, len(begin_token))
-        self.end_token_data = (end_token, len(end_token))
-        self.main_log_level = logging.DEBUG
+        self._begin_token_data = (begin_token, len(begin_token))
+        self._end_token_data = (end_token, len(end_token))
+
+        self._main_log_level = logging.DEBUG
+
+        self._log_to_main_log = process.context.config.loglevel <= self._main_log_level
+
         config = self._process.config
-        self.log_to_main_log = process.context.config.loglevel <= self.main_log_level
-        self.stdout_events_enabled = config.stdout.events_enabled
-        self.stderr_events_enabled = config.stderr.events_enabled
+        self._stdout_events_enabled = config.stdout.events_enabled
+        self._stderr_events_enabled = config.stderr.events_enabled
 
-    _child_log: ta.Optional[logging.Logger]  # the current logger (normal_log or capture_log)
-    _normal_log: ta.Optional[logging.Logger]  # the "normal" (non-capture) logger
-    _capture_log: ta.Optional[logging.Logger]  # the logger used while we're in capture_mode
+    _child_log: ta.Optional[logging.Logger] = None  # the current logger (normal_log or capture_log)
+    _normal_log: ta.Optional[logging.Logger] = None  # the "normal" (non-capture) logger
+    _capture_log: ta.Optional[logging.Logger] = None  # the logger used while we're in capture_mode
 
     def _init_normal_log(self) -> None:
         """
         Configure the "normal" (non-capture) log for this channel of this process. Sets self.normal_log if logging is
         enabled.
         """
+
         config = self._process.config  # noqa
         channel = self._channel  # noqa
 
@@ -146,7 +153,7 @@ class OutputDispatcher(Dispatcher):
         #         maxbytes=maxbytes,
         #         backups=backups,
         #     )
-        #
+
         # if to_syslog:
         #     loggers.handle_syslog(
         #         self.normal_log,
@@ -158,6 +165,7 @@ class OutputDispatcher(Dispatcher):
         Configure the capture log for this process.  This log is used to temporarily capture output when special output
         is detected. Sets self.capture_log if capturing is enabled.
         """
+
         capture_maxbytes = self.lc.capture_maxbytes
         if capture_maxbytes:
             self._capture_log = logging.getLogger(__name__)
@@ -184,9 +192,11 @@ class OutputDispatcher(Dispatcher):
         if data:
             if self._process.context.config.strip_ansi:
                 data = strip_escapes(data)
+
             if self._child_log:
                 self._child_log.info(data)
-            if self.log_to_main_log:
+
+            if self._log_to_main_log:
                 if not isinstance(data, bytes):
                     text = data
                 else:
@@ -194,11 +204,13 @@ class OutputDispatcher(Dispatcher):
                         text = data.decode('utf-8')
                     except UnicodeDecodeError:
                         text = f'Undecodable: {data!r}'
-                log.log(self.main_log_level, '%r %s output:\n%s', self._process.config.name, self._channel, text)  # noqa
+                log.log(self._main_log_level, '%r %s output:\n%s', self._process.config.name, self._channel, text)  # noqa
+
             if self._channel == 'stdout':
-                if self.stdout_events_enabled:
+                if self._stdout_events_enabled:
                     notify_event(ProcessLogStdoutEvent(self._process, self._process.pid, data))
-            elif self.stderr_events_enabled:
+
+            elif self._stderr_events_enabled:
                 notify_event(ProcessLogStderrEvent(self._process, self._process.pid, data))
 
     def record_output(self):
@@ -210,9 +222,9 @@ class OutputDispatcher(Dispatcher):
             return
 
         if self._capture_mode:
-            token, tokenlen = self.end_token_data
+            token, tokenlen = self._end_token_data
         else:
-            token, tokenlen = self.begin_token_data
+            token, tokenlen = self._begin_token_data
 
         if len(self._output_buffer) <= tokenlen:
             return  # not enough data

ominfra/supervisor/events.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006 UP007
+import abc
 import typing as ta
 
 from .compat import as_string
@@ -32,12 +33,11 @@ notify_event = EVENT_CALLBACKS.notify
 clear_events = EVENT_CALLBACKS.clear
 
 
-class Event:
+class Event(abc.ABC):  # noqa
     """Abstract event type """
 
 
-class ProcessLogEvent(Event):
-    """Abstract"""
+class ProcessLogEvent(Event, abc.ABC):
     channel: ta.Optional[str] = None
 
     def __init__(self, process, pid, data):
@@ -54,8 +54,8 @@ class ProcessLogEvent(Event):
             data = as_string(self.data)
         except UnicodeDecodeError:
             data = f'Undecodable: {self.data!r}'
-        fmt = as_string('processname:%s groupname:%s pid:%s channel:%s\n%s')
-        result = fmt % (
+
+        result = 'processname:%s groupname:%s pid:%s channel:%s\n%s' % (  # noqa
             as_string(self.process.config.name),
             as_string(groupname),
             self.pid,
@@ -73,8 +73,7 @@ class ProcessLogStderrEvent(ProcessLogEvent):
     channel = 'stderr'
 
 
-class ProcessCommunicationEvent(Event):
-    """ Abstract """
+class ProcessCommunicationEvent(Event, abc.ABC):
     # event mode tokens
     BEGIN_TOKEN = b'<!--XSUPERVISOR:BEGIN-->'
     END_TOKEN = b'<!--XSUPERVISOR:END-->'

ominfra/supervisor/exceptions.py

@@ -1,18 +1,20 @@
 class ProcessError(Exception):
-    """ Specialized exceptions used when attempting to start a process """
+    """Specialized exceptions used when attempting to start a process."""
 
 
 class BadCommandError(ProcessError):
-    """ Indicates the command could not be parsed properly. """
+    """Indicates the command could not be parsed properly."""
 
 
 class NotExecutableError(ProcessError):
-    """ Indicates that the filespec cannot be executed because its path
-    resolves to a file which is not executable, or which is a directory. """
+    """
+    Indicates that the filespec cannot be executed because its path resolves to a file which is not executable, or which
+    is a directory.
+    """
 
 
 class NotFoundError(ProcessError):
-    """ Indicates that the filespec cannot be executed because it could not be found """
+    """Indicates that the filespec cannot be executed because it could not be found."""
 
 
 class NoPermissionError(ProcessError):

ominfra/supervisor/process.py

@@ -143,6 +143,7 @@ class Subprocess(AbstractSubprocess):
         Internal: turn a program name into a file name, using $PATH, make sure it exists / is executable, raising a
         ProcessError if not
         """
+
         try:
             commandargs = shlex.split(self.config.command)
         except ValueError as e:
@@ -526,8 +527,12 @@ class Subprocess(AbstractSubprocess):
                 os.kill(self.pid, sig)
             except OSError as exc:
                 if exc.errno == errno.ESRCH:
-                    log.debug('unable to signal %s (pid %s), it probably just now exited '
-                              'on its own: %s', processname, self.pid, str(exc))
+                    log.debug(
+                        'unable to signal %s (pid %s), it probably just now exited on its own: %s',
+                        processname,
+                        self.pid,
+                        str(exc),
+                    )
                     # we could change the state here but we intentionally do not.  we will do it during normal SIGCHLD
                     # processing.
                     return None
@@ -543,6 +548,7 @@ class Subprocess(AbstractSubprocess):
 
     def finish(self, sts: int) -> None:
         """ The process was reaped and we need to report and manage its state """
+
         self.drain()
 
         es, msg = decode_wait_status(sts)
@@ -559,9 +565,11 @@ class Subprocess(AbstractSubprocess):
         else:
             too_quickly = False
             log.warning(
-                "process '%s' (%s) laststart time is in the future, don't "
-                "know how long process was running so assuming it did "
-                "not exit too quickly", processname, self.pid)
+                "process '%s' (%s) laststart time is in the future, don't know how long process was running so "
+                "assuming it did not exit too quickly",
+                processname,
+                self.pid,
+            )
 
         exit_expected = es in self.config.exitcodes
 
@@ -658,7 +666,7 @@ class Subprocess(AbstractSubprocess):
                     if self.config.autorestart is RestartUnconditionally:
                         # EXITED -> STARTING
                         self.spawn()
-                    elif self.exitstatus not in self.config.exitcodes:  # type: ignore
+                    elif self.exitstatus not in self.config.exitcodes:
                         # EXITED -> STARTING
                         self.spawn()
 

ominfra/supervisor/supervisor.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
 # @omlish-amalg ../scripts/supervisor.py
+import json
 import logging
 import signal
 import time
@@ -8,12 +9,12 @@ import typing as ta
 
 from omlish.lite.check import check_not_none
 from omlish.lite.logs import configure_standard_logging
+from omlish.lite.marshal import unmarshal_obj
 
 from .compat import ExitNow
 from .compat import as_string
 from .compat import decode_wait_status
 from .compat import signame
-from .configs import ProcessConfig
 from .configs import ProcessGroupConfig
 from .configs import ServerConfig
 from .context import ServerContext
@@ -331,39 +332,24 @@ def timeslice(period, when):
 
 
 def main(args=None, test=False):
+    import argparse
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('config_file', metavar='config-file')
+    args = parser.parse_args()
+
     configure_standard_logging('INFO')
 
+    if not (cf := args.config_file):
+        raise RuntimeError('No config file specified')
+
     # if we hup, restart by making a new Supervisor()
     first = True
     while True:
-        config = ServerConfig.new(
-            nodaemon=True,
-            groups=[
-                ProcessGroupConfig(
-                    name='default',
-                    processes=[
-                        ProcessConfig(
-                            name='sleep',
-                            command='sleep 600',
-                            stdout=ProcessConfig.Log(
-                                file='/dev/fd/1',
-                                maxbytes=0,
-                            ),
-                            redirect_stderr=True,
-                        ),
-                        ProcessConfig(
-                            name='ls',
-                            command='ls -al',
-                            stdout=ProcessConfig.Log(
-                                file='/dev/fd/1',
-                                maxbytes=0,
-                            ),
-                            redirect_stderr=True,
-                        ),
-                    ],
-                ),
-            ],
-        )
+        with open(cf) as f:
+            config_src = f.read()
+        config_dct = json.loads(config_src)
+        config: ServerConfig = unmarshal_obj(config_dct, ServerConfig)
 
         context = ServerContext(
             config,

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.dev92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev90
+Version: 0.0.0.dev92
 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.dev92
+Requires-Dist: omlish ==0.0.0.dev92
 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.dev92.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=d7jSbcaxjGgpVpDCPl1kJCOZg3S7g2n0Lf7gI0ZL3j0,9126
 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,29 +52,29 @@ 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/supervisor.py,sha256=EU989AXWM-QJF4BmvKSlxkkBvRR3n2rz6yeXhjzo100,106149
+ominfra/scripts/journald2aws.py,sha256=AgOHKPujUo4SqTFoz_EiN-oJ-HwZJB-UNyCFJypsNus,91403
+ominfra/scripts/supervisor.py,sha256=iWTZQIrzqNjlmuDH489AlfXGb0i_0sfoYIYP7h1LH-E,115374
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=usW9jjq5JPe_2SL8H5PrjDdksO75MX85Ir0HFfb35eM,72
-ominfra/supervisor/compat.py,sha256=sqsvlCNF2iMFdrc0LuTfyCBxXSVACtQx2wCfeHwWvAQ,5044
-ominfra/supervisor/configs.py,sha256=FjgsFijC_ivqJkLua4ZV0UWjDxP3JeDua3aVy4_CnbM,2970
-ominfra/supervisor/context.py,sha256=xh03VN8e4hHj5udjtgUvYnqUticTzCCXdIA0Xp4Ba2c,15335
-ominfra/supervisor/datatypes.py,sha256=cq2p7wnLN0nvKT-jZxaBByqsnCIUz6pX9dPtm69h18Q,4428
-ominfra/supervisor/dispatchers.py,sha256=4AVtJagOEalRnxwCZjNr8LpkCkykzzg2ncMZiYsC4Bc,10367
-ominfra/supervisor/events.py,sha256=wT-gPfvv2HCAyQXMq3jiek17Jq6kAZb0U2hekzjf3ks,7743
-ominfra/supervisor/exceptions.py,sha256=jq8Md--zmAHri1BB2XeDPFcTur81IRwArOcZoP7-6W0,746
+ominfra/supervisor/compat.py,sha256=Y1d_pk4eN18AbVYjDHAXMMnPwOKTFpc7JDb1uClYMsQ,5064
+ominfra/supervisor/configs.py,sha256=KpibZJ-V-4UpoJM2fnjXOXJLvDbwRJzNLXLGESUljV4,2966
+ominfra/supervisor/context.py,sha256=D2TCMX_P6M98_3JR2sgO97bsXEpP8EK_LTmYWgsUXqY,15337
+ominfra/supervisor/datatypes.py,sha256=UnXO_UlCyJD9u0uvea1wvnk_UZCzxNMeFvPK83gv530,4432
+ominfra/supervisor/dispatchers.py,sha256=FEZeHmrIyM6WWojJsp0wQcGacgAUpMrtHNfWVoC6vhs,10404
+ominfra/supervisor/events.py,sha256=OGGCuf1RWobFPDecksHJO3I4GmzBPgFvPce4-DOaZ3s,7729
+ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
 ominfra/supervisor/poller.py,sha256=RwVnjEl63-mNQUsJcVEEsFrwuh5aOKr9e-rrB2lWCgs,7726
-ominfra/supervisor/process.py,sha256=phucIv2a-LHXypY3kJ9fCsKEki9G9XdiJtXCVMgGcZI,31291
+ominfra/supervisor/process.py,sha256=RlwlHjHy8CPPMqTn1ljk2uHX628SCGwVEDfvnN22KgA,31390
 ominfra/supervisor/states.py,sha256=JMxXYTZhJkMNQZ2tTV6wId7wrvnWgiZteskACprKskM,1374
-ominfra/supervisor/supervisor.py,sha256=GnG8SAhJ5UUay7cM3oBJYb4TmIUaQUdWWqnhANpalPw,13811
+ominfra/supervisor/supervisor.py,sha256=eXmVKX-A3exX8yHmmJEhHVd-3VnjTtrfDCvV7EEb7o8,13238
 ominfra/supervisor/types.py,sha256=ec62QG0CDJc0XNxCnf3lXxhsxrr4CCScLPI-1SpQjlc,1141
 ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.dev92.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev92.dist-info/METADATA,sha256=3EP4RSIaP8hFXGqSoduoMjsCVPwtA9nWUhGOxvKkpWU,739
+ominfra-0.0.0.dev92.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ominfra-0.0.0.dev92.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev92.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev92.dist-info/RECORD,,

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

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