ominfra 0.0.0.dev120__py3-none-any.whl → 0.0.0.dev122__py3-none-any.whl

ominfra/supervisor/compat.py

@@ -161,6 +161,19 @@ def close_fd(fd: int) -> bool:
     return True
 
 
+def is_fd_open(fd: int) -> bool:
+    try:
+        n = os.dup(fd)
+    except OSError:
+        return False
+    os.close(n)
+    return True
+
+
+def get_open_fds(limit: int) -> ta.FrozenSet[int]:
+    return frozenset(filter(is_fd_open, range(limit)))
+
+
 def mktempfile(suffix: str, prefix: str, dir: str) -> str:  # noqa
     fd, filename = tempfile.mkstemp(suffix, prefix, dir)
     os.close(fd)

ominfra/supervisor/configs.py

@@ -5,6 +5,8 @@ import signal
 import tempfile
 import typing as ta
 
+from ..configs import ConfigMapping
+from ..configs import build_config_named_children
 from .datatypes import byte_size
 from .datatypes import existing_directory
 from .datatypes import existing_dirpath
@@ -12,6 +14,9 @@ from .datatypes import logging_level
 from .datatypes import octal_type
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class ProcessConfig:
     name: str
@@ -108,3 +113,19 @@ class ServerConfig:
             child_logdir=child_logdir if child_logdir else tempfile.gettempdir(),
             **kwargs,
         )
+
+
+##
+
+
+def prepare_process_group_config(dct: ConfigMapping) -> ConfigMapping:
+    out = dict(dct)
+    out['processes'] = build_config_named_children(out.get('processes'))
+    return out
+
+
+def prepare_server_config(dct: ta.Mapping[str, ta.Any]) -> ta.Mapping[str, ta.Any]:
+    out = dict(dct)
+    group_dcts = build_config_named_children(out.get('groups'))
+    out['groups'] = [prepare_process_group_config(group_dct) for group_dct in group_dcts or []]
+    return out

ominfra/supervisor/context.py

@@ -32,17 +32,24 @@ from .types import AbstractServerContext
 from .types import AbstractSubprocess
 
 
+ServerEpoch = ta.NewType('ServerEpoch', int)
+
+InheritedFds = ta.NewType('InheritedFds', ta.FrozenSet[int])
+
+
 class ServerContext(AbstractServerContext):
     def __init__(
             self,
             config: ServerConfig,
             *,
-            epoch: int = 0,
+            epoch: ServerEpoch = ServerEpoch(0),
+            inherited_fds: ta.Optional[InheritedFds] = None,
     ) -> None:
         super().__init__()
 
         self._config = config
         self._epoch = epoch
+        self._inherited_fds = InheritedFds(frozenset(inherited_fds or []))
 
         self._pid_history: ta.Dict[int, AbstractSubprocess] = {}
         self._state: SupervisorState = SupervisorStates.RUNNING
@@ -66,7 +73,7 @@ class ServerContext(AbstractServerContext):
         return self._config
 
     @property
-    def epoch(self) -> int:
+    def epoch(self) -> ServerEpoch:
         return self._epoch
 
     @property
@@ -96,6 +103,10 @@ class ServerContext(AbstractServerContext):
     def gid(self) -> ta.Optional[int]:
         return self._gid
 
+    @property
+    def inherited_fds(self) -> InheritedFds:
+        return self._inherited_fds
+
     ##
 
     def set_signals(self) -> None:

ominfra/supervisor/main.py

@@ -1,19 +1,82 @@
 #!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
 # @omlish-amalg ../scripts/supervisor.py
+import functools
 import itertools
-import json
+import os.path
 import typing as ta
 
+from omlish.lite.inject import Injector
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
 from omlish.lite.journald import journald_log_handler_factory
 from omlish.lite.logs import configure_standard_logging
-from omlish.lite.marshal import unmarshal_obj
 
+from ..configs import read_config_file
 from .compat import ExitNow
+from .compat import get_open_fds
+from .configs import ProcessConfig
+from .configs import ProcessGroupConfig
 from .configs import ServerConfig
+from .configs import prepare_server_config
+from .context import InheritedFds
 from .context import ServerContext
+from .context import ServerEpoch
+from .process import ProcessGroup
+from .process import Subprocess
+from .process import SubprocessFactory
 from .states import SupervisorStates
+from .supervisor import ProcessGroupFactory
 from .supervisor import Supervisor
+from .types import AbstractServerContext
+
+
+##
+
+
+def build_server_bindings(
+        config: ServerConfig,
+        *,
+        server_epoch: ta.Optional[ServerEpoch] = None,
+        inherited_fds: ta.Optional[InheritedFds] = None,
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(config),
+
+        inj.bind(ServerContext, singleton=True),
+        inj.bind(AbstractServerContext, to_key=ServerContext),
+
+        inj.bind(Supervisor, singleton=True),
+    ]
+
+    #
+
+    def make_process_group_factory(injector: Injector) -> ProcessGroupFactory:
+        def inner(group_config: ProcessGroupConfig) -> ProcessGroup:
+            return injector.inject(functools.partial(ProcessGroup, group_config))
+        return ProcessGroupFactory(inner)
+    lst.append(inj.bind(make_process_group_factory))
+
+    def make_subprocess_factory(injector: Injector) -> SubprocessFactory:
+        def inner(process_config: ProcessConfig, group: ProcessGroup) -> Subprocess:
+            return injector.inject(functools.partial(Subprocess, process_config, group))
+        return SubprocessFactory(inner)
+    lst.append(inj.bind(make_subprocess_factory))
+
+    #
+
+    if server_epoch is not None:
+        lst.append(inj.bind(server_epoch, key=ServerEpoch))
+    if inherited_fds is not None:
+        lst.append(inj.bind(inherited_fds, key=InheritedFds))
+
+    #
+
+    return inj.as_bindings(*lst)
+
+
+##
 
 
 def main(
@@ -26,6 +89,7 @@ def main(
     parser = argparse.ArgumentParser()
     parser.add_argument('config_file', metavar='config-file')
     parser.add_argument('--no-journald', action='store_true')
+    parser.add_argument('--inherit-initial-fds', action='store_true')
     args = parser.parse_args(argv)
 
     #
@@ -41,20 +105,27 @@ def main(
 
     #
 
+    initial_fds: ta.Optional[InheritedFds] = None
+    if args.inherit_initial_fds:
+        initial_fds = InheritedFds(get_open_fds(0x10000))
+
     # if we hup, restart by making a new Supervisor()
     for epoch in itertools.count():
-        with open(cf) as f:
-            config_src = f.read()
-
-        config_dct = json.loads(config_src)
-        config: ServerConfig = unmarshal_obj(config_dct, ServerConfig)
+        config = read_config_file(
+            os.path.expanduser(cf),
+            ServerConfig,
+            prepare=prepare_server_config,
+        )
 
-        context = ServerContext(
+        injector = inj.create_injector(build_server_bindings(
             config,
-            epoch=epoch,
-        )
+            server_epoch=ServerEpoch(epoch),
+            inherited_fds=initial_fds,
+        ))
+
+        context = injector.provide(ServerContext)
+        supervisor = injector.provide(Supervisor)
 
-        supervisor = Supervisor(context)
         try:
             supervisor.main()
         except ExitNow:

ominfra/supervisor/process.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006 UP007
+import dataclasses as dc
 import errno
 import functools
 import os.path
@@ -55,6 +56,9 @@ from .types import AbstractServerContext
 from .types import AbstractSubprocess
 
 
+##
+
+
 @functools.total_ordering
 class Subprocess(AbstractSubprocess):
     """A class to manage a subprocess."""
@@ -80,7 +84,12 @@ class Subprocess(AbstractSubprocess):
     spawn_err = None  # error message attached by spawn() if any
     group = None  # ProcessGroup instance if process is in the group
 
-    def __init__(self, config: ProcessConfig, group: 'ProcessGroup', context: AbstractServerContext) -> None:
+    def __init__(
+            self,
+            config: ProcessConfig,
+            group: 'ProcessGroup',
+            context: AbstractServerContext,
+    ) -> None:
         super().__init__()
         self._config = config
         self.group = group
@@ -324,8 +333,10 @@ class Subprocess(AbstractSubprocess):
             os.dup2(self._pipes['child_stdout'], 2)
         else:
             os.dup2(self._pipes['child_stderr'], 2)
-        # FIXME: leave debugger fds
+
         for i in range(3, self.context.config.minfds):
+            if i in self.context.inherited_fds:
+                continue
             close_fd(i)
 
     def _spawn_as_child(self, filename: str, argv: ta.Sequence[str]) -> None:
@@ -719,15 +730,39 @@ class Subprocess(AbstractSubprocess):
         pass
 
 
+##
+
+
+@dc.dataclass(frozen=True)
+class SubprocessFactory:
+    fn: ta.Callable[[ProcessConfig, 'ProcessGroup'], Subprocess]
+
+    def __call__(self, config: ProcessConfig, group: 'ProcessGroup') -> Subprocess:
+        return self.fn(config, group)
+
+
 @functools.total_ordering
 class ProcessGroup:
-    def __init__(self, config: ProcessGroupConfig, context: ServerContext):
+    def __init__(
+            self,
+            config: ProcessGroupConfig,
+            context: ServerContext,
+            *,
+            subprocess_factory: ta.Optional[SubprocessFactory] = None,
+    ):
         super().__init__()
         self.config = config
         self.context = context
+
+        if subprocess_factory is None:
+            def make_subprocess(config: ProcessConfig, group: ProcessGroup) -> Subprocess:
+                return Subprocess(config, group, self.context)
+            subprocess_factory = SubprocessFactory(make_subprocess)
+        self._subprocess_factory = subprocess_factory
+
         self.processes = {}
         for pconfig in self.config.processes or []:
-            process = Subprocess(pconfig, self, self.context)
+            process = self._subprocess_factory(pconfig, self)
             self.processes[pconfig.name] = process
 
     def __lt__(self, other):

ominfra/supervisor/supervisor.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006 UP007
+import dataclasses as dc
 import signal
 import time
 import typing as ta
@@ -31,12 +32,32 @@ def timeslice(period: int, when: float) -> int:
     return int(when - (when % period))
 
 
+@dc.dataclass(frozen=True)
+class ProcessGroupFactory:
+    fn: ta.Callable[[ProcessGroupConfig], ProcessGroup]
+
+    def __call__(self, config: ProcessGroupConfig) -> ProcessGroup:
+        return self.fn(config)
+
+
 class Supervisor:
 
-    def __init__(self, context: ServerContext) -> None:
+    def __init__(
+            self,
+            context: ServerContext,
+            *,
+            process_group_factory: ta.Optional[ProcessGroupFactory] = None,
+    ) -> None:
         super().__init__()
 
         self._context = context
+
+        if process_group_factory is None:
+            def make_process_group(config: ProcessGroupConfig) -> ProcessGroup:
+                return ProcessGroup(config, self._context)
+            process_group_factory = ProcessGroupFactory(make_process_group)
+        self._process_group_factory = process_group_factory
+
         self._ticks: ta.Dict[int, float] = {}
         self._process_groups: ta.Dict[str, ProcessGroup] = {}  # map of process group name to process group object
         self._stop_groups: ta.Optional[ta.List[ProcessGroup]] = None  # list used for priority ordered shutdown
@@ -78,7 +99,7 @@ class Supervisor:
         if name in self._process_groups:
             return False
 
-        group = self._process_groups[name] = ProcessGroup(config, self._context)
+        group = self._process_groups[name] = self._process_group_factory(config)
         group.after_setuid()
 
         EVENT_CALLBACKS.notify(ProcessGroupAddedEvent(name))

ominfra/supervisor/types.py

@@ -27,6 +27,11 @@ class AbstractServerContext(abc.ABC):
     def pid_history(self) -> ta.Dict[int, 'AbstractSubprocess']:
         raise NotImplementedError
 
+    @property
+    @abc.abstractmethod
+    def inherited_fds(self) -> ta.FrozenSet[int]:
+        raise NotImplementedError
+
 
 class AbstractSubprocess(abc.ABC):
     @property

ominfra/threadworkers.py

@@ -1,9 +1,11 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
 """
+FIXME:
+ - group is racy af - meditate on has_started, etc
+
 TODO:
- - implement stop lol
- - collective heartbeat monitoring - ThreadWorkerGroups
+ - overhaul stop lol
  - group -> 'context'? :|
   - shared stop_event?
 """
@@ -29,6 +31,7 @@ class ThreadWorker(ExitStacked, abc.ABC):
             self,
             *,
             stop_event: ta.Optional[threading.Event] = None,
+            worker_groups: ta.Optional[ta.Iterable['ThreadWorkerGroup']] = None,
     ) -> None:
         super().__init__()
 
@@ -40,6 +43,9 @@ class ThreadWorker(ExitStacked, abc.ABC):
         self._thread: ta.Optional[threading.Thread] = None
         self._last_heartbeat: ta.Optional[float] = None
 
+        for g in worker_groups or []:
+            g.add(self)
+
     #
 
     def __enter__(self: ThreadWorkerT) -> ThreadWorkerT:
@@ -84,13 +90,13 @@ class ThreadWorker(ExitStacked, abc.ABC):
             if self._thread is not None:
                 raise RuntimeError('Thread already started: %r', self)
 
-            thr = threading.Thread(target=self.__run)
+            thr = threading.Thread(target=self.__thread_main)
             self._thread = thr
             thr.start()
 
     #
 
-    def __run(self) -> None:
+    def __thread_main(self) -> None:
         try:
             self._run()
         except ThreadWorker.Stopping:
@@ -108,10 +114,17 @@ class ThreadWorker(ExitStacked, abc.ABC):
     def stop(self) -> None:
         self._stop_event.set()
 
-    def join(self, timeout: ta.Optional[float] = None) -> None:
+    def join(
+            self,
+            timeout: ta.Optional[float] = None,
+            *,
+            unless_not_started: bool = False,
+    ) -> None:
         with self._lock:
             if self._thread is None:
-                raise RuntimeError('Thread not started: %r', self)
+                if not unless_not_started:
+                    raise RuntimeError('Thread not started: %r', self)
+                return
             self._thread.join(timeout)
 
 
@@ -120,20 +133,64 @@ class ThreadWorker(ExitStacked, abc.ABC):
 
 class ThreadWorkerGroup:
     @dc.dataclass()
-    class State:
+    class _State:
         worker: ThreadWorker
 
+        last_heartbeat: ta.Optional[float] = None
+
     def __init__(self) -> None:
         super().__init__()
 
         self._lock = threading.RLock()
-        self._states: ta.Dict[ThreadWorker, ThreadWorkerGroup.State] = {}
+        self._states: ta.Dict[ThreadWorker, ThreadWorkerGroup._State] = {}
+        self._last_heartbeat_check: ta.Optional[float] = None
+
+    #
 
     def add(self, *workers: ThreadWorker) -> 'ThreadWorkerGroup':
         with self._lock:
             for w in workers:
                 if w in self._states:
                     raise KeyError(w)
-                self._states[w] = ThreadWorkerGroup.State(w)
+                self._states[w] = ThreadWorkerGroup._State(w)
 
         return self
+
+    #
+
+    def start_all(self) -> None:
+        thrs = list(self._states)
+        with self._lock:
+            for thr in thrs:
+                if not thr.has_started():
+                    thr.start()
+
+    def stop_all(self) -> None:
+        for w in reversed(list(self._states)):
+            if w.has_started():
+                w.stop()
+
+    def join_all(self, timeout: ta.Optional[float] = None) -> None:
+        for w in reversed(list(self._states)):
+            if w.has_started():
+                w.join(timeout, unless_not_started=True)
+
+    #
+
+    def get_dead(self) -> ta.List[ThreadWorker]:
+        with self._lock:
+            return [thr for thr in self._states if not thr.is_alive()]
+
+    def check_heartbeats(self) -> ta.Dict[ThreadWorker, float]:
+        with self._lock:
+            dct: ta.Dict[ThreadWorker, float] = {}
+            for thr, st in self._states.items():
+                if not thr.has_started():
+                    continue
+                hb = thr.last_heartbeat
+                if hb is None:
+                    hb = time.time()
+                st.last_heartbeat = hb
+                dct[st.worker] = time.time() - hb
+            self._last_heartbeat_check = time.time()
+        return dct

{ominfra-0.0.0.dev120.dist-info → ominfra-0.0.0.dev122.dist-info}/METADATA

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

{ominfra-0.0.0.dev120.dist-info → ominfra-0.0.0.dev122.dist-info}/RECORD

@@ -2,8 +2,9 @@ ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
+ominfra/configs.py,sha256=8aU1Qmbr-qjaE2iP3gAbA2SWJYMPZ-uGK007L01PoOI,1727
 ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
-ominfra/threadworkers.py,sha256=QuRpz9Yjyb4F8_IjzqmL7eNCAmXZfy3XLl7QoVF7Ohw,3273
+ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
 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
@@ -13,14 +14,15 @@ ominfra/clouds/aws/dataclasses.py,sha256=rKhtJKJ0JhMssU9n9CABX_JaUiokIboEATJ9TZg
 ominfra/clouds/aws/logs.py,sha256=z9ouU2IYXNHsl7_Whbjs1FGtlUwsEq0RV8LNrM_QNTE,5471
 ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViutQ,2767
 ominfra/clouds/aws/journald2aws/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
+ominfra/clouds/aws/journald2aws/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
 ominfra/clouds/aws/journald2aws/cursor.py,sha256=tQ7O6BHlEdaalbiI_Rqagj0aHfdtTQ_ZJwdOSRUjNvQ,1173
-ominfra/clouds/aws/journald2aws/driver.py,sha256=8jiuEpOgKFSucpEJBBTBiSVg6L_tA4alUNK-I788HWU,5452
-ominfra/clouds/aws/journald2aws/main.py,sha256=xFkEhkYKtFfW0XRfY0UaX_gd_FU66WTZOMCyiIaPY3E,2237
+ominfra/clouds/aws/journald2aws/driver.py,sha256=E9RhdMzDXxOnDfLyHqU7N_7iygXqxy4apq2xz_EDxkA,6127
+ominfra/clouds/aws/journald2aws/main.py,sha256=RQJhk4aPtnp4EHzC-ST1Rs9BN6D7bqQQVjCRxGU7JuQ,2147
 ominfra/clouds/aws/journald2aws/poster.py,sha256=hz1XuctW8GtLmfjhRvCFY6py52D4BzXHYny5XKFpHSA,2833
 ominfra/clouds/gcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/gcp/auth.py,sha256=3PyfRJNgajjMqJFem3SKui0CqGeHEsZlvbRhuxFcZG8,1348
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=YnEw91L55EXvR51UTl95FtXFUe3rUmidlkD4qccE7Tg,34211
+ominfra/deploy/_executor.py,sha256=46QRoTcnPzhu7RvIL9m7zfx4_AwysA4XdZ1LvABCcHA,34589
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/deploy/remote.py,sha256=6ACmpXU1uBdyGs3Xsp97ktKFq30cJlzN9LRWNUWlGY4,2144
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -35,7 +37,7 @@ ominfra/deploy/executor/concerns/systemd.py,sha256=MtsSEToEa1HNouern_JukcYTnypw_
 ominfra/deploy/executor/concerns/user.py,sha256=j5LDfQXquIp-eEM7t6aShsrYoQrM_ILXZycTmTcRVxA,686
 ominfra/deploy/executor/concerns/venv.py,sha256=jbRriqJHO4r9Zyo5Hfl_qVmcU6Qm6UgrouBroKcPn2g,775
 ominfra/deploy/poly/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/deploy/poly/_main.py,sha256=iKhlTayS2j3Ra_eCSK6Qro8j4H573DLoPw8490RMIA8,24194
+ominfra/deploy/poly/_main.py,sha256=N-ajqT7UPdacBbFViTyzDkbM8y2kyH4lzGKsV4lN7uo,24198
 ominfra/deploy/poly/base.py,sha256=Bd-CzUTaDvTRbdXKiTxMxs77WCEXItwNoBYCRnTk1u4,4167
 ominfra/deploy/poly/configs.py,sha256=9bzWdbxhOk_Q4KokDjmRz254KHnUU71Vl1frLlhQyU4,584
 ominfra/deploy/poly/deploy.py,sha256=tMYKslXLjstcv86siRt5j37USsS0Wd6lsfeGRE26zio,544
@@ -54,35 +56,35 @@ ominfra/journald/tailer.py,sha256=5abcFMfgi7fnY9ZEQe2ZVobaJxjQkeu6d9Kagw33a1w,33
 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
-ominfra/pyremote/_runcommands.py,sha256=XWBVKBE6QOlzue9lu5_wFdySt_pJ1sOj7N9KTjawW-A,28047
+ominfra/pyremote/_runcommands.py,sha256=SGMQpN5-LDM99yNYR7lvjdkkJ_jVinSfmxm9mU34hjc,28425
 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=0HHYi_uBV1t2KefVrExs3IZ6Zy-mQa7xN_ka9W9Obb8,94910
-ominfra/scripts/supervisor.py,sha256=C1eT7pIqPRJgN4U87tOjR_SuOSUwd5aUswvPeTy5Xlw,121831
+ominfra/scripts/journald2aws.py,sha256=G56Fx-fHv3p2brOObTwdX7ORA2blhslFfooG2LQL6h4,128491
+ominfra/scripts/supervisor.py,sha256=Vv4x7BER3xAZ-ORNM-5SB1HsSJvu-eSYfcgx3kx5Vfo,173118
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
-ominfra/supervisor/compat.py,sha256=Y1d_pk4eN18AbVYjDHAXMMnPwOKTFpc7JDb1uClYMsQ,5064
-ominfra/supervisor/configs.py,sha256=KpibZJ-V-4UpoJM2fnjXOXJLvDbwRJzNLXLGESUljV4,2966
-ominfra/supervisor/context.py,sha256=Fg_wD6oUR8vxe3JMM14mR-5ssIrTNwxRr-AXfoGbzJQ,15795
+ominfra/supervisor/compat.py,sha256=mutfnQbSCDaE7TSuQArOcFdfGVw4uEE_E04rIhs1IqU,5312
+ominfra/supervisor/configs.py,sha256=TtVyWdxinrd3tueM6q8j2YVcEqauFTJqlbykkSjByEo,3524
+ominfra/supervisor/context.py,sha256=Ss4xqnLe8LafIcg10oSr8KyqAJZxjofgNDB_pVoyBA8,16164
 ominfra/supervisor/datatypes.py,sha256=UnXO_UlCyJD9u0uvea1wvnk_UZCzxNMeFvPK83gv530,4432
 ominfra/supervisor/dispatchers.py,sha256=sJ61yTo9EEbxHwe2NbzOTAFFFCuuyIhYli_xJioQBoo,10423
 ominfra/supervisor/events.py,sha256=IhdL7Fj-hEvTvZ5WF6aIa2YjSPQhuUoasoJSMmRLQkU,7650
 ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
-ominfra/supervisor/main.py,sha256=0bj_9AzIfDlB1BB8zcX9npQIknamN7FGoVEYgLMLuP0,1701
+ominfra/supervisor/main.py,sha256=v3Ezr7ECzqYX33HmhWbZrh78-h-1OnnxqPqmjS4zkFw,4000
 ominfra/supervisor/poller.py,sha256=VCBxLItfA4Vj69jet2XFbFScPbmdD9JA1evaofk_AnY,7709
-ominfra/supervisor/process.py,sha256=94cglin7qBwxTNXjOBxqec4qsACu-VfeboW-JfzvvbE,31454
+ominfra/supervisor/process.py,sha256=oEd58g6KcLNWhwaZBu8wZJjb6Vd0t1sKPMVE4BjbBSI,32270
 ominfra/supervisor/states.py,sha256=JMxXYTZhJkMNQZ2tTV6wId7wrvnWgiZteskACprKskM,1374
-ominfra/supervisor/supervisor.py,sha256=p612yph5aKzkVLH6CfOMcRHEbNfs_TMlmjfLwtG8Jo0,12324
-ominfra/supervisor/types.py,sha256=ec62QG0CDJc0XNxCnf3lXxhsxrr4CCScLPI-1SpQjlc,1141
+ominfra/supervisor/supervisor.py,sha256=7T7RAtGc9qsb0s9fBiimReVyaWknl1e3rGU9nNxjll8,13002
+ominfra/supervisor/types.py,sha256=GhVixieeJ00fWclxPLM2oMugCe9wEjW44wJzQ2AO0V0,1264
 ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=DSGp4hn5xwOW-l_u_InKlSF6kIobxtUtVssf_73STs0,3567
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev120.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev120.dist-info/METADATA,sha256=xuFwZN7LnvBCDHvhqgdKONRKkDYUYJ6SZqTjaE4k2rI,742
-ominfra-0.0.0.dev120.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-ominfra-0.0.0.dev120.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev120.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev120.dist-info/RECORD,,
+ominfra-0.0.0.dev122.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev122.dist-info/METADATA,sha256=deSke0MO3j-CHNhTN8uGgI-3374_P5fgfqJgo4GRVMU,742
+ominfra-0.0.0.dev122.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+ominfra-0.0.0.dev122.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev122.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev122.dist-info/RECORD,,