ominfra 0.0.0.dev215__py3-none-any.whl → 0.0.0.dev217__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -4122,7 +4122,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
@@ -4235,6 +4235,12 @@ def configure_standard_logging(
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -4280,6 +4286,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -4313,16 +4338,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -4330,35 +4370,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

ominfra/scripts/manage.py

@@ -8059,7 +8059,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
@@ -8172,6 +8172,12 @@ def configure_standard_logging(
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -8217,6 +8223,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -8250,16 +8275,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -8267,35 +8307,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

ominfra/scripts/supervisor.py

@@ -6939,7 +6939,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),

{ominfra-0.0.0.dev215.dist-info → ominfra-0.0.0.dev217.dist-info}/METADATA

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

{ominfra-0.0.0.dev215.dist-info → ominfra-0.0.0.dev217.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=L2869lSuOOAY661RHuBDOASyGdKYV_kv7cGzRLkRYNk,169939
-ominfra/scripts/manage.py,sha256=3W98AKjgRnrJhi8kV4cjolN0KszLe-CjbCpK5EvBWAc,361316
-ominfra/scripts/supervisor.py,sha256=7VnX50-CsDc1TXhTUgdmRMar6rPCUPQWMD2skPJoeCY,295536
+ominfra/scripts/journald2aws.py,sha256=CM1nZMpecXJpcg7icJUCJ-_DX-7CduQurxZQ7EmhQmA,171450
+ominfra/scripts/manage.py,sha256=MaUur1_dDdMHt5YnE6Waxa_v70kydHzKCBHXAuTmKd0,362827
+ominfra/scripts/supervisor.py,sha256=Laa7EM9tsLzjzb2Pkg2DVeUJX7OpsWLHuwlA9WP0cNM,295534
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev215.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev215.dist-info/METADATA,sha256=6zq5SYVgPq5gGLIj8UXizw_sNhzt87DhAp0MmfNtGcY,731
-ominfra-0.0.0.dev215.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev215.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev215.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev215.dist-info/RECORD,,
+ominfra-0.0.0.dev217.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev217.dist-info/METADATA,sha256=iTe6sIvgKblZxtFkb4vMZGGDzVFpVoV0l2bXB-3Jf5k,731
+ominfra-0.0.0.dev217.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev217.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev217.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev217.dist-info/RECORD,,