ominfra 0.0.0.dev137__py3-none-any.whl → 0.0.0.dev138__py3-none-any.whl

ominfra/supervisor/processimpl.py

@@ -82,7 +82,7 @@ class ProcessImpl(Process):
         self._backoff = 0  # backoff counter (to start_retries)
 
         self._exitstatus: ta.Optional[Rc] = None  # status attached to dead process by finish()
-        self._spawn_err: ta.Optional[str] = None  # error message attached by spawn() if any
+        self._spawn_err: ta.Optional[str] = None  # error message attached by _spawn() if any
 
     #
 
@@ -119,12 +119,12 @@ class ProcessImpl(Process):
 
     #
 
-    def spawn(self) -> ta.Optional[Pid]:
+    def _spawn(self) -> ta.Optional[Pid]:
         if self.pid:
             log.warning('process \'%s\' already running', self.name)
             return None
 
-        self.check_in_state(
+        self._check_in_state(
             ProcessState.EXITED,
             ProcessState.FATAL,
             ProcessState.BACKOFF,
@@ -139,15 +139,15 @@ class ProcessImpl(Process):
 
         self._last_start = time.time()
 
-        self.change_state(ProcessState.STARTING)
+        self._change_state(ProcessState.STARTING)
 
         try:
             sp = self._spawning.spawn()
         except ProcessSpawnError as err:
             log.exception('Spawn error')
             self._spawn_err = err.args[0]
-            self.check_in_state(ProcessState.STARTING)
-            self.change_state(ProcessState.BACKOFF)
+            self._check_in_state(ProcessState.STARTING)
+            self._change_state(ProcessState.BACKOFF)
             return None
 
         log.info("Spawned: '%s' with pid %s", self.name, sp.pid)
@@ -180,7 +180,7 @@ class ProcessImpl(Process):
 
     #
 
-    def change_state(self, new_state: ProcessState, expected: bool = True) -> bool:
+    def _change_state(self, new_state: ProcessState, expected: bool = True) -> bool:
         old_state = self._state
         if new_state is old_state:
             return False
@@ -198,7 +198,7 @@ class ProcessImpl(Process):
 
         return True
 
-    def check_in_state(self, *states: ProcessState) -> None:
+    def _check_in_state(self, *states: ProcessState) -> None:
         if self._state not in states:
             raise ProcessStateError(
                 f'Check failed for {self._config.name}: '
@@ -207,7 +207,7 @@ class ProcessImpl(Process):
 
     #
 
-    def _check_and_adjust_for_system_clock_rollback(self, test_time):
+    def _check_and_adjust_for_system_clock_rollback(self, test_time: float) -> None:
         """
         Check if system clock has rolled backward beyond test_time. If so, set affected timestamps to test_time.
         """
@@ -251,8 +251,8 @@ class ProcessImpl(Process):
         self._delay = 0
         self._backoff = 0
         self._system_stop = True
-        self.check_in_state(ProcessState.BACKOFF)
-        self.change_state(ProcessState.FATAL)
+        self._check_in_state(ProcessState.BACKOFF)
+        self._change_state(ProcessState.FATAL)
 
     def kill(self, sig: int) -> ta.Optional[str]:
         """
@@ -262,6 +262,7 @@ class ProcessImpl(Process):
         Return None if the signal was sent, or an error message string if an error occurred or if the subprocess is not
         running.
         """
+
         now = time.time()
 
         # If the process is in BACKOFF and we want to stop or kill it, then BACKOFF -> STOPPED. This is needed because
@@ -269,7 +270,7 @@ class ProcessImpl(Process):
         # blocked for a long time waiting for the retries.
         if self._state == ProcessState.BACKOFF:
             log.debug('Attempted to kill %s, which is in BACKOFF state.', self.name)
-            self.change_state(ProcessState.STOPPED)
+            self._change_state(ProcessState.STOPPED)
             return None
 
         args: tuple
@@ -294,8 +295,8 @@ class ProcessImpl(Process):
         self._killing = True
         self._delay = now + self._config.stop_wait_secs
         # we will already be in the STOPPING state if we're doing a SIGKILL as a result of overrunning stop_wait_secs
-        self.check_in_state(ProcessState.RUNNING, ProcessState.STARTING, ProcessState.STOPPING)
-        self.change_state(ProcessState.STOPPING)
+        self._check_in_state(ProcessState.RUNNING, ProcessState.STARTING, ProcessState.STOPPING)
+        self._change_state(ProcessState.STOPPING)
 
         kpid = int(self.pid)
         if kill_as_group:
@@ -316,7 +317,7 @@ class ProcessImpl(Process):
             tb = traceback.format_exc()
             fmt, args = 'unknown problem killing %s (%s):%s', (self.name, self.pid, tb)
             log.critical(fmt, *args)
-            self.change_state(ProcessState.UNKNOWN)
+            self._change_state(ProcessState.UNKNOWN)
             self._killing = False
             self._delay = 0
             return fmt % args
@@ -338,7 +339,7 @@ class ProcessImpl(Process):
 
         log.debug('sending %s (pid %s) sig %s', self.name, self.pid, sig_name(sig))
 
-        self.check_in_state(ProcessState.RUNNING, ProcessState.STARTING, ProcessState.STOPPING)
+        self._check_in_state(ProcessState.RUNNING, ProcessState.STARTING, ProcessState.STOPPING)
 
         try:
             try:
@@ -359,7 +360,7 @@ class ProcessImpl(Process):
             tb = traceback.format_exc()
             fmt, args = 'unknown problem sending sig %s (%s):%s', (self.name, self.pid, tb)
             log.critical(fmt, *args)
-            self.change_state(ProcessState.UNKNOWN)
+            self._change_state(ProcessState.UNKNOWN)
             return fmt % args
 
         return None
@@ -397,8 +398,8 @@ class ProcessImpl(Process):
             self._exitstatus = Rc(es)
 
             fmt, args = 'stopped: %s (%s)', (self.name, msg)
-            self.check_in_state(ProcessState.STOPPING)
-            self.change_state(ProcessState.STOPPED)
+            self._check_in_state(ProcessState.STOPPING)
+            self._change_state(ProcessState.STOPPED)
             if exit_expected:
                 log.info(fmt, *args)
             else:
@@ -408,8 +409,8 @@ class ProcessImpl(Process):
             # the program did not stay up long enough to make it to RUNNING implies STARTING -> BACKOFF
             self._exitstatus = None
             self._spawn_err = 'Exited too quickly (process log may have details)'
-            self.check_in_state(ProcessState.STARTING)
-            self.change_state(ProcessState.BACKOFF)
+            self._check_in_state(ProcessState.STARTING)
+            self._change_state(ProcessState.BACKOFF)
             log.warning('exited: %s (%s)', self.name, msg + '; not expected')
 
         else:
@@ -422,18 +423,18 @@ class ProcessImpl(Process):
             # if the process was STARTING but a system time change causes self.last_start to be in the future, the
             # normal STARTING->RUNNING transition can be subverted so we perform the transition here.
             if self._state == ProcessState.STARTING:
-                self.change_state(ProcessState.RUNNING)
+                self._change_state(ProcessState.RUNNING)
 
-            self.check_in_state(ProcessState.RUNNING)
+            self._check_in_state(ProcessState.RUNNING)
 
             if exit_expected:
                 # expected exit code
-                self.change_state(ProcessState.EXITED, expected=True)
+                self._change_state(ProcessState.EXITED, expected=True)
                 log.info('exited: %s (%s)', self.name, msg + '; expected')
             else:
                 # unexpected exit code
                 self._spawn_err = f'Bad exit code {es}'
-                self.change_state(ProcessState.EXITED, expected=False)
+                self._change_state(ProcessState.EXITED, expected=False)
                 log.warning('exited: %s (%s)', self.name, msg + '; not expected')
 
         self._pid = Pid(0)
@@ -453,21 +454,21 @@ class ProcessImpl(Process):
                 if self._config.auto_restart:
                     if self._config.auto_restart is RestartUnconditionally:
                         # EXITED -> STARTING
-                        self.spawn()
+                        self._spawn()
                     elif self._exitstatus not in self._config.exitcodes:
                         # EXITED -> STARTING
-                        self.spawn()
+                        self._spawn()
 
             elif state == ProcessState.STOPPED and not self._last_start:
                 if self._config.auto_start:
                     # STOPPED -> STARTING
-                    self.spawn()
+                    self._spawn()
 
             elif state == ProcessState.BACKOFF:
                 if self._backoff <= self._config.start_retries:
                     if now > self._delay:
                         # BACKOFF -> STARTING
-                        self.spawn()
+                        self._spawn()
 
         if state == ProcessState.STARTING:
             if now - self._last_start > self._config.start_secs:
@@ -475,8 +476,8 @@ class ProcessImpl(Process):
                 # proc.config.start_secs,
                 self._delay = 0
                 self._backoff = 0
-                self.check_in_state(ProcessState.STARTING)
-                self.change_state(ProcessState.RUNNING)
+                self._check_in_state(ProcessState.STARTING)
+                self._change_state(ProcessState.RUNNING)
                 msg = ('entered RUNNING state, process has stayed up for > than %s seconds (start_secs)' % self._config.start_secs)  # noqa
                 log.info('success: %s %s', self.name, msg)
 

{ominfra-0.0.0.dev137.dist-info → ominfra-0.0.0.dev138.dist-info}/METADATA

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

{ominfra-0.0.0.dev137.dist-info → ominfra-0.0.0.dev138.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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/pyremote.py,sha256=djh4WzAUqqBoVfXij5ylYHtEh0bo5jxPWicnkg16q1s,10514
+ominfra/pyremote.py,sha256=vIEUncFgYvcFj3aK0dvJkRuAuaaRyqXk7c8rl2WPOR4,12599
 ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
 ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,14 +57,14 @@ ominfra/manage/deploy/poly/site.py,sha256=QJwDDJoVm2-kxi4bxIrp-mn4y2qDLuW3CAUax3
 ominfra/manage/deploy/poly/supervisor.py,sha256=zkl6VQBcAZaMAhyR9DbbbqULcgFCDZoe9S_vP-mMFQ8,2289
 ominfra/manage/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1552
 ominfra/manage/new/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/manage/new/_manage.py,sha256=ERsODiUvQUoZQKCPbQUMQDtBLvq3OnFV-jejfLHgmTI,40760
-ominfra/manage/new/main.py,sha256=xIRUXiofpz8Fh3KBw80TdgqGigArC1xooZ1vaIqvxGM,3912
+ominfra/manage/new/_manage.py,sha256=4dunrnkHpCn-c0Qtf2mxr5ocZ2_InZf7oWSaEWrbICw,43797
+ominfra/manage/new/main.py,sha256=m2faeXJbyDDR-smXOQKNIgRorsWYtOXYJOlL_q_5s34,5094
 ominfra/manage/new/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/new/commands/base.py,sha256=TTrHL213jf-ClVqToiNHuxQey1Yf6052E8u3E9hAf7Q,574
 ominfra/manage/new/commands/subprocess.py,sha256=GpbD-cTorgCRg203lCl81HAh-NBYA6ObKa5ZP2ss9rg,1884
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=kCyeyCo53GRoCKAdVAe0aGkgmINxi8IBcUfRXphACek,131618
-ominfra/scripts/supervisor.py,sha256=GO_e3e6WWqdBE-WejtaTrzU8yjtZBiadD-o2Nb-aJ6o,245838
+ominfra/scripts/supervisor.py,sha256=3rhnR5gT3MxqFW9ew5ePYioTDLvEcM2nlYmvbGBCvzI,245884
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -82,7 +82,7 @@ ominfra/supervisor/main.py,sha256=oqaWOcnHJgaxNhjyphPgjaNjHPjDcx7kzYMjtZpwSxE,42
 ominfra/supervisor/pipes.py,sha256=2ZihNTnRNjnIPOtPbm3_pyqO15f7BNs7WnNtO5V8ahM,2231
 ominfra/supervisor/privileges.py,sha256=kaRTHI7XjqzxEWCeHp3_0J0Vc4gSPugRbXEwxuw6MYE,2054
 ominfra/supervisor/process.py,sha256=UaubVxsxVqDnbuWVpTH0DTGbJGLO0vGJ9mNcvy2kCXM,217
-ominfra/supervisor/processimpl.py,sha256=BcvX-e03qjFSUogDUVmevwyizXS3kss3JY1QkHWjKWE,18689
+ominfra/supervisor/processimpl.py,sha256=eLpzoxwmXG7LoT_noFncbGGlr28Sjynz3_xYyF8gFUs,18735
 ominfra/supervisor/setup.py,sha256=7HwwwI-WT_Z0WjZ9_l5Orr4K298nKKhQ1f_ZgGsi9TU,622
 ominfra/supervisor/setupimpl.py,sha256=88h3oYsdJ0LAo7sZZZGRQti14oQay3b-0Vd_h3Cl108,9638
 ominfra/supervisor/signals.py,sha256=jY52naUifcAjd6nICTP1ZW3IQSPsHB4cvbsJo8_QV_U,2196
@@ -106,9 +106,9 @@ 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.dev137.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev137.dist-info/METADATA,sha256=8OfILeUYDutFSCpF5j3-yPVNgBa0WHp_CM49WDloxZA,731
-ominfra-0.0.0.dev137.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev137.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev137.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev137.dist-info/RECORD,,
+ominfra-0.0.0.dev138.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev138.dist-info/METADATA,sha256=eyC6k2kjxqRdu8PLufNmlTvtZOsyBCvxnppRs00qx7w,731
+ominfra-0.0.0.dev138.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev138.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev138.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev138.dist-info/RECORD,,