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

ominfra/supervisor/supervisor.py

@@ -1,31 +1,25 @@
-#!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
-# @omlish-amalg ../scripts/supervisor.py
-import json
-import logging
 import signal
 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 configure_standard_logging
-from omlish.lite.marshal import unmarshal_obj
+from omlish.lite.logs import log
 
 from .compat import ExitNow
 from .compat import as_string
 from .compat import decode_wait_status
 from .compat import signame
 from .configs import ProcessGroupConfig
-from .configs import ServerConfig
 from .context import ServerContext
 from .dispatchers import Dispatcher
+from .events import EVENT_CALLBACKS
 from .events import TICK_EVENTS
 from .events import ProcessGroupAddedEvent
 from .events import ProcessGroupRemovedEvent
 from .events import SupervisorRunningEvent
 from .events import SupervisorStoppingEvent
-from .events import clear_events
-from .events import notify_event
 from .process import ProcessGroup
 from .process import Subprocess
 from .states import SupervisorState
@@ -33,7 +27,8 @@ from .states import SupervisorStates
 from .states import get_process_state_description
 
 
-log = logging.getLogger(__name__)
+def timeslice(period: int, when: float) -> int:
+    return int(when - (when % period))
 
 
 class Supervisor:
@@ -48,6 +43,8 @@ class Supervisor:
         self._stopping = False  # set after we detect that we are handling a stop request
         self._last_shutdown_report = 0.  # throttle for delayed process error reports at stop
 
+    #
+
     @property
     def context(self) -> ServerContext:
         return self._context
@@ -55,47 +52,14 @@ class Supervisor:
     def get_state(self) -> SupervisorState:
         return self._context.state
 
-    def main(self) -> None:
-        if not self._context.first:
-            # prevent crash on libdispatch-based systems, at least for the first request
-            self._context.cleanup_fds()
-
-        self._context.set_uid_or_exit()
+    #
 
-        if self._context.first:
-            self._context.set_rlimits_or_exit()
-
-        # this sets the options.logger object delay logger instantiation until after setuid
-        if not self._context.config.nocleanup:
-            # clean up old automatic logs
-            self._context.clear_auto_child_logdir()
-
-        self.run()
-
-    def run(self) -> None:
-        self._process_groups = {}  # clear
-        self._stop_groups = None  # clear
-
-        clear_events()
-
-        try:
-            for config in self._context.config.groups or []:
-                self.add_process_group(config)
-
-            self._context.set_signals()
-
-            if not self._context.config.nodaemon and self._context.first:
-                self._context.daemonize()
-
-            # writing pid file needs to come *after* daemonizing or pid will be wrong
-            self._context.write_pidfile()
+    class DiffToActive(ta.NamedTuple):
+        added: ta.List[ProcessGroupConfig]
+        changed: ta.List[ProcessGroupConfig]
+        removed: ta.List[ProcessGroupConfig]
 
-            self.runforever()
-
-        finally:
-            self._context.cleanup()
-
-    def diff_to_active(self):
+    def diff_to_active(self) -> DiffToActive:
         new = self._context.config.groups or []
         cur = [group.config for group in self._process_groups.values()]
 
@@ -107,7 +71,7 @@ class Supervisor:
 
         changed = [cand for cand in new if cand != curdict.get(cand.name, cand)]
 
-        return added, changed, removed
+        return Supervisor.DiffToActive(added, changed, removed)
 
     def add_process_group(self, config: ProcessGroupConfig) -> bool:
         name = config.name
@@ -117,7 +81,7 @@ class Supervisor:
         group = self._process_groups[name] = ProcessGroup(config, self._context)
         group.after_setuid()
 
-        notify_event(ProcessGroupAddedEvent(name))
+        EVENT_CALLBACKS.notify(ProcessGroupAddedEvent(name))
         return True
 
     def remove_process_group(self, name: str) -> bool:
@@ -128,7 +92,7 @@ class Supervisor:
 
         del self._process_groups[name]
 
-        notify_event(ProcessGroupRemovedEvent(name))
+        EVENT_CALLBACKS.notify(ProcessGroupRemovedEvent(name))
         return True
 
     def get_process_map(self) -> ta.Dict[int, Dispatcher]:
@@ -157,6 +121,72 @@ class Supervisor:
 
         return unstopped
 
+    #
+
+    def main(self) -> None:
+        self.setup()
+        self.run()
+
+    @cached_nullary
+    def setup(self) -> None:
+        if not self._context.first:
+            # prevent crash on libdispatch-based systems, at least for the first request
+            self._context.cleanup_fds()
+
+        self._context.set_uid_or_exit()
+
+        if self._context.first:
+            self._context.set_rlimits_or_exit()
+
+        # this sets the options.logger object delay logger instantiation until after setuid
+        if not self._context.config.nocleanup:
+            # clean up old automatic logs
+            self._context.clear_auto_child_logdir()
+
+    def run(
+            self,
+            *,
+            callback: ta.Optional[ta.Callable[['Supervisor'], bool]] = None,
+    ) -> None:
+        self._process_groups = {}  # clear
+        self._stop_groups = None  # clear
+
+        EVENT_CALLBACKS.clear()
+
+        try:
+            for config in self._context.config.groups or []:
+                self.add_process_group(config)
+
+            self._context.set_signals()
+
+            if not self._context.config.nodaemon and self._context.first:
+                self._context.daemonize()
+
+            # writing pid file needs to come *after* daemonizing or pid will be wrong
+            self._context.write_pidfile()
+
+            EVENT_CALLBACKS.notify(SupervisorRunningEvent())
+
+            while True:
+                if callback is not None and not callback(self):
+                    break
+
+                self._run_once()
+
+        finally:
+            self._context.cleanup()
+
+    #
+
+    def _run_once(self) -> None:
+        self._poll()
+        self._reap()
+        self._handle_signal()
+        self._tick()
+
+        if self._context.state < SupervisorStates.RUNNING:
+            self._ordered_stop_groups_phase_2()
+
     def _ordered_stop_groups_phase_1(self) -> None:
         if self._stop_groups:
             # stop the last group (the one with the "highest" priority)
@@ -173,110 +203,77 @@ class Supervisor:
                 # down, so push it back on to the end of the stop group queue
                 self._stop_groups.append(group)
 
-    def runforever(self) -> None:
-        notify_event(SupervisorRunningEvent())
-        timeout = 1  # this cannot be fewer than the smallest TickEvent (5)
-
-        while True:
-            combined_map = {}
-            combined_map.update(self.get_process_map())
-
-            pgroups = list(self._process_groups.values())
-            pgroups.sort()
-
-            if self._context.state < SupervisorStates.RUNNING:
-                if not self._stopping:
-                    # first time, set the stopping flag, do a notification and set stop_groups
-                    self._stopping = True
-                    self._stop_groups = pgroups[:]
-                    notify_event(SupervisorStoppingEvent())
-
-                self._ordered_stop_groups_phase_1()
-
-                if not self.shutdown_report():
-                    # if there are no unstopped processes (we're done killing everything), it's OK to shutdown or reload
-                    raise ExitNow
-
-            for fd, dispatcher in combined_map.items():
-                if dispatcher.readable():
-                    self._context.poller.register_readable(fd)
-                if dispatcher.writable():
-                    self._context.poller.register_writable(fd)
-
-            r, w = self._context.poller.poll(timeout)
-
-            for fd in r:
-                if fd in combined_map:
-                    try:
-                        dispatcher = combined_map[fd]
-                        log.debug('read event caused by %r', dispatcher)
-                        dispatcher.handle_read_event()
-                        if not dispatcher.readable():
-                            self._context.poller.unregister_readable(fd)
-                    except ExitNow:
-                        raise
-                    except Exception:  # noqa
-                        combined_map[fd].handle_error()
-                else:
-                    # if the fd is not in combined_map, we should unregister it. otherwise, it will be polled every
-                    # time, which may cause 100% cpu usage
-                    log.debug('unexpected read event from fd %r', fd)
-                    try:
-                        self._context.poller.unregister_readable(fd)
-                    except Exception:  # noqa
-                        pass
-
-            for fd in w:
-                if fd in combined_map:
-                    try:
-                        dispatcher = combined_map[fd]
-                        log.debug('write event caused by %r', dispatcher)
-                        dispatcher.handle_write_event()
-                        if not dispatcher.writable():
-                            self._context.poller.unregister_writable(fd)
-                    except ExitNow:
-                        raise
-                    except Exception:  # noqa
-                        combined_map[fd].handle_error()
-                else:
-                    log.debug('unexpected write event from fd %r', fd)
-                    try:
-                        self._context.poller.unregister_writable(fd)
-                    except Exception:  # noqa
-                        pass
-
-            for group in pgroups:
-                group.transition()
+    def _poll(self) -> None:
+        combined_map = {}
+        combined_map.update(self.get_process_map())
 
-            self._reap()
-            self._handle_signal()
-            self._tick()
+        pgroups = list(self._process_groups.values())
+        pgroups.sort()
 
-            if self._context.state < SupervisorStates.RUNNING:
-                self._ordered_stop_groups_phase_2()
+        if self._context.state < SupervisorStates.RUNNING:
+            if not self._stopping:
+                # first time, set the stopping flag, do a notification and set stop_groups
+                self._stopping = True
+                self._stop_groups = pgroups[:]
+                EVENT_CALLBACKS.notify(SupervisorStoppingEvent())
 
-            if self._context.test:
-                break
+            self._ordered_stop_groups_phase_1()
 
-    def _tick(self, now: ta.Optional[float] = None) -> None:
-        """Send one or more 'tick' events when the timeslice related to the period for the event type rolls over"""
-
-        if now is None:
-            # now won't be None in unit tests
-            now = time.time()
+            if not self.shutdown_report():
+                # if there are no unstopped processes (we're done killing everything), it's OK to shutdown or reload
+                raise ExitNow
 
-        for event in TICK_EVENTS:
-            period = event.period  # type: ignore
+        for fd, dispatcher in combined_map.items():
+            if dispatcher.readable():
+                self._context.poller.register_readable(fd)
+            if dispatcher.writable():
+                self._context.poller.register_writable(fd)
 
-            last_tick = self._ticks.get(period)
-            if last_tick is None:
-                # we just started up
-                last_tick = self._ticks[period] = timeslice(period, now)
+        timeout = 1  # this cannot be fewer than the smallest TickEvent (5)
+        r, w = self._context.poller.poll(timeout)
+
+        for fd in r:
+            if fd in combined_map:
+                try:
+                    dispatcher = combined_map[fd]
+                    log.debug('read event caused by %r', dispatcher)
+                    dispatcher.handle_read_event()
+                    if not dispatcher.readable():
+                        self._context.poller.unregister_readable(fd)
+                except ExitNow:
+                    raise
+                except Exception:  # noqa
+                    combined_map[fd].handle_error()
+            else:
+                # if the fd is not in combined_map, we should unregister it. otherwise, it will be polled every
+                # time, which may cause 100% cpu usage
+                log.debug('unexpected read event from fd %r', fd)
+                try:
+                    self._context.poller.unregister_readable(fd)
+                except Exception:  # noqa
+                    pass
+
+        for fd in w:
+            if fd in combined_map:
+                try:
+                    dispatcher = combined_map[fd]
+                    log.debug('write event caused by %r', dispatcher)
+                    dispatcher.handle_write_event()
+                    if not dispatcher.writable():
+                        self._context.poller.unregister_writable(fd)
+                except ExitNow:
+                    raise
+                except Exception:  # noqa
+                    combined_map[fd].handle_error()
+            else:
+                log.debug('unexpected write event from fd %r', fd)
+                try:
+                    self._context.poller.unregister_writable(fd)
+                except Exception:  # noqa
+                    pass
 
-            this_tick = timeslice(period, now)
-            if this_tick != last_tick:
-                self._ticks[period] = this_tick
-                notify_event(event(this_tick, self))
+        for group in pgroups:
+            group.transition()
 
     def _reap(self, *, once: bool = False, depth: int = 0) -> None:
         if depth >= 100:
@@ -326,51 +323,22 @@ class Supervisor:
         else:
             log.debug('received %s indicating nothing', signame(sig))
 
+    def _tick(self, now: ta.Optional[float] = None) -> None:
+        """Send one or more 'tick' events when the timeslice related to the period for the event type rolls over"""
 
-def timeslice(period, when):
-    return int(when - (when % period))
-
-
-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:
-        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,
-        )
-
-        context.first = first
-        context.test = test
-        go(context)
-        # options.close_logger()
-        first = False
-        if test or (context.state < SupervisorStates.RESTARTING):
-            break
-
+        if now is None:
+            # now won't be None in unit tests
+            now = time.time()
 
-def go(context):  # pragma: no cover
-    d = Supervisor(context)
-    try:
-        d.main()
-    except ExitNow:
-        pass
+        for event in TICK_EVENTS:
+            period = event.period  # type: ignore
 
+            last_tick = self._ticks.get(period)
+            if last_tick is None:
+                # we just started up
+                last_tick = self._ticks[period] = timeslice(period, now)
 
-if __name__ == '__main__':
-    main()
+            this_tick = timeslice(period, now)
+            if this_tick != last_tick:
+                self._ticks[period] = this_tick
+                EVENT_CALLBACKS.notify(event(this_tick, self))

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

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

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

@@ -20,7 +20,7 @@ ominfra/clouds/aws/journald2aws/poster.py,sha256=hz1XuctW8GtLmfjhRvCFY6py52D4BzX
 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=3_ndcukzPt6Pc-5Cfnxz4OFjOYJefuTYM6ouijRjhTs,34042
+ominfra/deploy/_executor.py,sha256=YnEw91L55EXvR51UTl95FtXFUe3rUmidlkD4qccE7Tg,34211
 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 +35,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=EtMN9Cmn4plMLTXq3u_NHUUhaa8qjsyldN61AbjDQEg,24025
+ominfra/deploy/poly/_main.py,sha256=iKhlTayS2j3Ra_eCSK6Qro8j4H573DLoPw8490RMIA8,24194
 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
@@ -47,40 +47,42 @@ ominfra/deploy/poly/site.py,sha256=QJwDDJoVm2-kxi4bxIrp-mn4y2qDLuW3CAUax3W8gv8,2
 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/fields.py,sha256=NjjVn7GW4jkcGdyiiizVjEfQqSFnolXYk3kDcSQcMmc,12278
 ominfra/journald/genmessages.py,sha256=rLTS-K2v7otNOtTz4RoOEVYCm0fQuuBzf47e0T61tA8,1857
 ominfra/journald/messages.py,sha256=2iMY4k63XGNcN3LPvBmmK55ftjupnNh8f_ijlW9mkhQ,2208
-ominfra/journald/tailer.py,sha256=-CTQPkDQUBJJOpQCueFDsF5VmlfPSaSrbrGB505SUuM,36819
+ominfra/journald/tailer.py,sha256=5abcFMfgi7fnY9ZEQe2ZVobaJxjQkeu6d9Kagw33a1w,33525
 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=IGFDDcmXJDmhGv7AFAAjkCJc615YQGUsNvn5vTAYReY,27878
+ominfra/pyremote/_runcommands.py,sha256=XWBVKBE6QOlzue9lu5_wFdySt_pJ1sOj7N9KTjawW-A,28047
 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=ZI6SppxsDEwnjk0zaBmAmhyi3-3VVbWubDkeGz_DEU8,98035
-ominfra/scripts/supervisor.py,sha256=Qf6WKD_4EkC_5QWimApONAAs3lvcAKK2X7nOaYDex48,116162
+ominfra/scripts/journald2aws.py,sha256=0HHYi_uBV1t2KefVrExs3IZ6Zy-mQa7xN_ka9W9Obb8,94910
+ominfra/scripts/supervisor.py,sha256=C1eT7pIqPRJgN4U87tOjR_SuOSUwd5aUswvPeTy5Xlw,121831
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/supervisor/__main__.py,sha256=usW9jjq5JPe_2SL8H5PrjDdksO75MX85Ir0HFfb35eM,72
+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=D2TCMX_P6M98_3JR2sgO97bsXEpP8EK_LTmYWgsUXqY,15337
+ominfra/supervisor/context.py,sha256=Fg_wD6oUR8vxe3JMM14mR-5ssIrTNwxRr-AXfoGbzJQ,15795
 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/dispatchers.py,sha256=sJ61yTo9EEbxHwe2NbzOTAFFFCuuyIhYli_xJioQBoo,10423
+ominfra/supervisor/events.py,sha256=IhdL7Fj-hEvTvZ5WF6aIa2YjSPQhuUoasoJSMmRLQkU,7650
 ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
-ominfra/supervisor/poller.py,sha256=RwVnjEl63-mNQUsJcVEEsFrwuh5aOKr9e-rrB2lWCgs,7726
-ominfra/supervisor/process.py,sha256=RlwlHjHy8CPPMqTn1ljk2uHX628SCGwVEDfvnN22KgA,31390
+ominfra/supervisor/main.py,sha256=0bj_9AzIfDlB1BB8zcX9npQIknamN7FGoVEYgLMLuP0,1701
+ominfra/supervisor/poller.py,sha256=VCBxLItfA4Vj69jet2XFbFScPbmdD9JA1evaofk_AnY,7709
+ominfra/supervisor/process.py,sha256=94cglin7qBwxTNXjOBxqec4qsACu-VfeboW-JfzvvbE,31454
 ominfra/supervisor/states.py,sha256=JMxXYTZhJkMNQZ2tTV6wId7wrvnWgiZteskACprKskM,1374
-ominfra/supervisor/supervisor.py,sha256=eXmVKX-A3exX8yHmmJEhHVd-3VnjTtrfDCvV7EEb7o8,13238
+ominfra/supervisor/supervisor.py,sha256=p612yph5aKzkVLH6CfOMcRHEbNfs_TMlmjfLwtG8Jo0,12324
 ominfra/supervisor/types.py,sha256=ec62QG0CDJc0XNxCnf3lXxhsxrr4CCScLPI-1SpQjlc,1141
 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.dev118.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev118.dist-info/METADATA,sha256=1vaiRtsilENF8WHnikugHKKzYSu2PrDx1brtN-gcG8M,742
-ominfra-0.0.0.dev118.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-ominfra-0.0.0.dev118.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev118.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev118.dist-info/RECORD,,
+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,,