ominfra 0.0.0.dev150__py3-none-any.whl → 0.0.0.dev152__py3-none-any.whl

ominfra/clouds/aws/journald2aws/driver.py

@@ -41,8 +41,8 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import ExitStacked
 from omlish.lite.logs import log
-from omlish.lite.pidfile import Pidfile
 from omlish.lite.runtime import is_debugger_attached
+from omlish.os.pidfile import Pidfile
 
 from ....journald.messages import JournalctlMessage  # noqa
 from ....journald.tailer import JournalctlTailerWorker

ominfra/manage/main.py

@@ -8,6 +8,7 @@ manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 import asyncio
 import contextlib
 import json
+import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
@@ -31,7 +32,7 @@ from .remote.spawning import RemoteSpawning
 
 class MainCli(ArgparseCli):
     @argparse_command(
-        argparse_arg('--payload-file'),
+        argparse_arg('--_payload-file'),
 
         argparse_arg('-s', '--shell'),
         argparse_arg('-q', '--shell-quote', action='store_true'),
@@ -49,10 +50,7 @@ class MainCli(ArgparseCli):
 
         argparse_arg('command', nargs='+'),
     )
-    def run(self) -> None:
-        asyncio.run(self._async_run())
-
-    async def _async_run(self) -> None:
+    async def run(self) -> None:
         bs = MainBootstrap(
             main_config=MainConfig(
                 log_level='DEBUG' if self.args.debug else 'INFO',
@@ -61,7 +59,7 @@ class MainCli(ArgparseCli):
             ),
 
             remote_config=RemoteConfig(
-                payload_file=self.args.payload_file,  # noqa
+                payload_file=self.args._payload_file,  # noqa
 
                 pycharm_remote_debug=PycharmRemoteDebug(
                     port=self.args.pycharm_debug_port,
@@ -124,7 +122,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    MainCli().call_and_exit()
+    sys.exit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':

ominfra/manage/remote/_main.py

@@ -12,11 +12,11 @@ from omlish.lite.asyncio.asyncio import asyncio_open_stream_reader
 from omlish.lite.asyncio.asyncio import asyncio_open_stream_writer
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.deathsig import set_process_deathsig
 from omlish.lite.inject import Injector
 from omlish.lite.logs import log
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.pycharm import pycharm_debug_connect
+from omlish.os.deathsig import set_process_deathsig
 
 from ...pyremote import pyremote_bootstrap_finalize
 from ..bootstrap import MainBootstrap

ominfra/scripts/journald2aws.py

@@ -64,7 +64,7 @@ CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 # ../../../../omlish/lite/check.py
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 CheckMessage = ta.Union[str, ta.Callable[..., ta.Optional[str]], None]  # ta.TypeAlias
-CheckLateConfigureFn = ta.Callable[['Checks'], None]
+CheckLateConfigureFn = ta.Callable[['Checks'], None]  # ta.TypeAlias
 CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
@@ -79,7 +79,7 @@ ConfigMapping = ta.Mapping[str, ta.Any]
 ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
 
 # ../../../../omlish/lite/subprocesses.py
-SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 
 ########################################
@@ -1439,73 +1439,6 @@ json_dump_compact: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../../../omlish/lite/pidfile.py
-
-
-class Pidfile:
-    def __init__(self, path: str) -> None:
-        super().__init__()
-        self._path = path
-
-    _f: ta.TextIO
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self._path!r})'
-
-    def __enter__(self) -> 'Pidfile':
-        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
-        try:
-            os.set_inheritable(fd, True)
-            f = os.fdopen(fd, 'r+')
-        except Exception:
-            try:
-                os.close(fd)
-            except Exception:  # noqa
-                pass
-            raise
-        self._f = f
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if hasattr(self, '_f'):
-            self._f.close()
-            del self._f
-
-    def try_lock(self) -> bool:
-        try:
-            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            return True
-        except OSError:
-            return False
-
-    def ensure_locked(self) -> None:
-        if not self.try_lock():
-            raise RuntimeError('Could not get lock')
-
-    def write(self, pid: ta.Optional[int] = None) -> None:
-        self.ensure_locked()
-        if pid is None:
-            pid = os.getpid()
-        self._f.write(f'{pid}\n')
-        self._f.flush()
-
-    def clear(self) -> None:
-        self.ensure_locked()
-        self._f.seek(0)
-        self._f.truncate()
-
-    def read(self) -> int:
-        if self.try_lock():
-            raise RuntimeError('Got lock')
-        self._f.seek(0)
-        return int(self._f.read())
-
-    def kill(self, sig: int = signal.SIGTERM) -> None:
-        pid = self.read()
-        os.kill(pid, sig)  # FIXME: Still racy
-
-
 ########################################
 # ../../../../../omlish/lite/reflect.py
 
@@ -1628,6 +1561,73 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../../../omlish/os/pidfile.py
+
+
+class Pidfile:
+    def __init__(self, path: str) -> None:
+        super().__init__()
+        self._path = path
+
+    _f: ta.TextIO
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self._path!r})'
+
+    def __enter__(self) -> 'Pidfile':
+        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
+        try:
+            os.set_inheritable(fd, True)
+            f = os.fdopen(fd, 'r+')
+        except Exception:
+            try:
+                os.close(fd)
+            except Exception:  # noqa
+                pass
+            raise
+        self._f = f
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if hasattr(self, '_f'):
+            self._f.close()
+            del self._f
+
+    def try_lock(self) -> bool:
+        try:
+            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
+            return True
+        except OSError:
+            return False
+
+    def ensure_locked(self) -> None:
+        if not self.try_lock():
+            raise RuntimeError('Could not get lock')
+
+    def write(self, pid: ta.Optional[int] = None) -> None:
+        self.ensure_locked()
+        if pid is None:
+            pid = os.getpid()
+        self._f.write(f'{pid}\n')
+        self._f.flush()
+
+    def clear(self) -> None:
+        self.ensure_locked()
+        self._f.seek(0)
+        self._f.truncate()
+
+    def read(self) -> int:
+        if self.try_lock():
+            raise RuntimeError('Got lock')
+        self._f.seek(0)
+        return int(self._f.read())
+
+    def kill(self, sig: int = signal.SIGTERM) -> None:
+        pid = self.read()
+        os.kill(pid, sig)  # FIXME: Still racy
+
+
 ########################################
 # ../../auth.py
 """

ominfra/scripts/manage.py

@@ -78,7 +78,7 @@ CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 # ../../omlish/lite/check.py
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 CheckMessage = ta.Union[str, ta.Callable[..., ta.Optional[str]], None]  # ta.TypeAlias
-CheckLateConfigureFn = ta.Callable[['Checks'], None]
+CheckLateConfigureFn = ta.Callable[['Checks'], None]  # ta.TypeAlias
 CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
@@ -103,7 +103,7 @@ InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
 InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
 
 # ../../omlish/lite/subprocesses.py
-SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 
 ########################################
@@ -1611,30 +1611,6 @@ class Checks:
 check = Checks()
 
 
-########################################
-# ../../../omlish/lite/deathsig.py
-
-
-LINUX_PR_SET_PDEATHSIG = 1  # Second arg is a signal
-LINUX_PR_GET_PDEATHSIG = 2  # Second arg is a ptr to return the signal
-
-
-def set_process_deathsig(sig: int) -> bool:
-    if sys.platform == 'linux':
-        libc = ct.CDLL('libc.so.6')
-
-        # int prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
-        libc.prctl.restype = ct.c_int
-        libc.prctl.argtypes = [ct.c_int, ct.c_ulong, ct.c_ulong, ct.c_ulong, ct.c_ulong]
-
-        libc.prctl(LINUX_PR_SET_PDEATHSIG, sig, 0, 0, 0, 0)
-
-        return True
-
-    else:
-        return False
-
-
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -1880,6 +1856,30 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../omlish/os/deathsig.py
+
+
+LINUX_PR_SET_PDEATHSIG = 1  # Second arg is a signal
+LINUX_PR_GET_PDEATHSIG = 2  # Second arg is a ptr to return the signal
+
+
+def set_process_deathsig(sig: int) -> bool:
+    if sys.platform == 'linux':
+        libc = ct.CDLL('libc.so.6')
+
+        # int prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
+        libc.prctl.restype = ct.c_int
+        libc.prctl.argtypes = [ct.c_int, ct.c_ulong, ct.c_ulong, ct.c_ulong, ct.c_ulong]
+
+        libc.prctl(LINUX_PR_SET_PDEATHSIG, sig, 0, 0, 0, 0)
+
+        return True
+
+    else:
+        return False
+
+
 ########################################
 # ../../../omdev/packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -2618,6 +2618,8 @@ def get_remote_payload_src(
 TODO:
  - default command
  - auto match all underscores to hyphens
+ - pre-run, post-run hooks
+ - exitstack?
 """
 
 
@@ -2737,11 +2739,12 @@ class ArgparseCli:
 
         self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
 
+    #
+
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
         ns = cls.__dict__
-
         objs = {}
         mro = cls.__mro__[::-1]
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
@@ -2754,24 +2757,33 @@ class ArgparseCli:
                 elif k in objs:
                     del [k]
 
+        #
+
         anns = ta.get_type_hints(_ArgparseCliAnnotationBox({
             **{k: v for bcls in reversed(mro) for k, v in getattr(bcls, '__annotations__', {}).items()},
             **ns.get('__annotations__', {}),
         }), globalns=ns.get('__globals__', {}))
 
+        #
+
         if '_parser' in ns:
             parser = check.isinstance(ns['_parser'], argparse.ArgumentParser)
         else:
             parser = argparse.ArgumentParser()
             setattr(cls, '_parser', parser)
 
+        #
+
         subparsers = parser.add_subparsers()
+
         for att, obj in objs.items():
             if isinstance(obj, ArgparseCommand):
                 if obj.parent is not None:
                     raise NotImplementedError
+
                 for cn in [obj.name, *(obj.aliases or [])]:
-                    cparser = subparsers.add_parser(cn)
+                    subparser = subparsers.add_parser(cn)
+
                     for arg in (obj.args or []):
                         if (
                                 len(arg.args) == 1 and
@@ -2779,29 +2791,34 @@ class ArgparseCli:
                                 not (n := check.isinstance(arg.args[0], str)).startswith('-') and
                                 'metavar' not in arg.kwargs
                         ):
-                            cparser.add_argument(
+                            subparser.add_argument(
                                 n.replace('-', '_'),
                                 **arg.kwargs,
                                 metavar=n,
                             )
                         else:
-                            cparser.add_argument(*arg.args, **arg.kwargs)
-                    cparser.set_defaults(_cmd=obj)
+                            subparser.add_argument(*arg.args, **arg.kwargs)
+
+                    subparser.set_defaults(_cmd=obj)
 
             elif isinstance(obj, ArgparseArg):
                 if att in anns:
-                    akwargs = _get_argparse_arg_ann_kwargs(anns[att])
-                    obj.kwargs = {**akwargs, **obj.kwargs}
+                    ann_kwargs = _get_argparse_arg_ann_kwargs(anns[att])
+                    obj.kwargs = {**ann_kwargs, **obj.kwargs}
+
                 if not obj.dest:
                     if 'dest' in obj.kwargs:
                         obj.dest = obj.kwargs['dest']
                     else:
                         obj.dest = obj.kwargs['dest'] = att  # type: ignore
+
                 parser.add_argument(*obj.args, **obj.kwargs)
 
             else:
                 raise TypeError(obj)
 
+    #
+
     _parser: ta.ClassVar[argparse.ArgumentParser]
 
     @classmethod
@@ -2820,10 +2837,12 @@ class ArgparseCli:
     def unknown_args(self) -> ta.Sequence[str]:
         return self._unknown_args
 
-    def _run_cmd(self, cmd: ArgparseCommand) -> ta.Optional[int]:
-        return cmd.__get__(self, type(self))()
+    #
+
+    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+        return cmd.__get__(self, type(self))
 
-    def __call__(self) -> ta.Optional[int]:
+    def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
         cmd = getattr(self.args, '_cmd', None)
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
@@ -2835,12 +2854,34 @@ class ArgparseCli:
 
         if cmd is None:
             self.get_parser().print_help()
+            return None
+
+        return self._bind_cli_cmd(cmd)
+
+    #
+
+    def cli_run(self) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
             return 0
 
-        return self._run_cmd(cmd)
+        return fn()
 
-    def call_and_exit(self) -> ta.NoReturn:
-        sys.exit(rc if isinstance(rc := self(), int) else 0)
+    def cli_run_and_exit(self) -> ta.NoReturn:
+        sys.exit(rc if isinstance(rc := self.cli_run(), int) else 0)
+
+    def __call__(self, *, exit: bool = False) -> ta.Optional[int]:  # noqa
+        if exit:
+            return self.cli_run_and_exit()
+        else:
+            return self.cli_run()
+
+    #
+
+    async def async_cli_run(self) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
+            return 0
+
+        return await fn()
 
 
 ########################################
@@ -6975,7 +7016,7 @@ def main_bootstrap(bs: MainBootstrap) -> Injector:
 
 class MainCli(ArgparseCli):
     @argparse_command(
-        argparse_arg('--payload-file'),
+        argparse_arg('--_payload-file'),
 
         argparse_arg('-s', '--shell'),
         argparse_arg('-q', '--shell-quote', action='store_true'),
@@ -6993,10 +7034,7 @@ class MainCli(ArgparseCli):
 
         argparse_arg('command', nargs='+'),
     )
-    def run(self) -> None:
-        asyncio.run(self._async_run())
-
-    async def _async_run(self) -> None:
+    async def run(self) -> None:
         bs = MainBootstrap(
             main_config=MainConfig(
                 log_level='DEBUG' if self.args.debug else 'INFO',
@@ -7005,7 +7043,7 @@ class MainCli(ArgparseCli):
             ),
 
             remote_config=RemoteConfig(
-                payload_file=self.args.payload_file,  # noqa
+                payload_file=self.args._payload_file,  # noqa
 
                 pycharm_remote_debug=PycharmRemoteDebug(
                     port=self.args.pycharm_debug_port,
@@ -7068,7 +7106,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    MainCli().call_and_exit()
+    sys.exit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':

ominfra/scripts/supervisor.py

@@ -107,7 +107,7 @@ CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 # ../../omlish/lite/check.py
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 CheckMessage = ta.Union[str, ta.Callable[..., ta.Optional[str]], None]  # ta.TypeAlias
-CheckLateConfigureFn = ta.Callable[['Checks'], None]
+CheckLateConfigureFn = ta.Callable[['Checks'], None]  # ta.TypeAlias
 CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
@@ -4682,163 +4682,6 @@ class Injection:
 inj = Injection
 
 
-########################################
-# ../../../omlish/lite/journald.py
-
-
-##
-
-
-class sd_iovec(ct.Structure):  # noqa
-    pass
-
-
-sd_iovec._fields_ = [
-    ('iov_base', ct.c_void_p),  # Pointer to data.
-    ('iov_len', ct.c_size_t),  # Length of data.
-]
-
-
-##
-
-
-@cached_nullary
-def sd_libsystemd() -> ta.Any:
-    lib = ct.CDLL('libsystemd.so.0')
-
-    lib.sd_journal_sendv.restype = ct.c_int
-    lib.sd_journal_sendv.argtypes = [ct.POINTER(sd_iovec), ct.c_int]
-
-    return lib
-
-
-@cached_nullary
-def sd_try_libsystemd() -> ta.Optional[ta.Any]:
-    try:
-        return sd_libsystemd()
-    except OSError:  # noqa
-        return None
-
-
-##
-
-
-def sd_journald_send(**fields: str) -> int:
-    lib = sd_libsystemd()
-
-    msgs = [
-        f'{k.upper()}={v}\0'.encode('utf-8')
-        for k, v in fields.items()
-    ]
-
-    vec = (sd_iovec * len(msgs))()
-    cl = (ct.c_char_p * len(msgs))()  # noqa
-    for i in range(len(msgs)):
-        vec[i].iov_base = ct.cast(ct.c_char_p(msgs[i]), ct.c_void_p)
-        vec[i].iov_len = len(msgs[i]) - 1
-
-    return lib.sd_journal_sendv(vec, len(msgs))
-
-
-##
-
-
-SD_LOG_LEVEL_MAP: ta.Mapping[int, int] = {
-    logging.FATAL: syslog.LOG_EMERG,  # system is unusable
-    # LOG_ALERT ?  # action must be taken immediately
-    logging.CRITICAL: syslog.LOG_CRIT,
-    logging.ERROR: syslog.LOG_ERR,
-    logging.WARNING: syslog.LOG_WARNING,
-    # LOG_NOTICE ?  # normal but significant condition
-    logging.INFO: syslog.LOG_INFO,
-    logging.DEBUG: syslog.LOG_DEBUG,
-}
-
-
-class JournaldLogHandler(logging.Handler):
-    """
-    TODO:
-     - fallback handler for when this barfs
-    """
-
-    def __init__(
-            self,
-            *,
-            use_formatter_output: bool = False,
-    ) -> None:
-        super().__init__()
-
-        sd_libsystemd()
-
-        self._use_formatter_output = use_formatter_output
-
-    #
-
-    EXTRA_RECORD_ATTRS_BY_JOURNALD_FIELD: ta.ClassVar[ta.Mapping[str, str]] = {
-        'name': 'name',
-        'module': 'module',
-        'exception': 'exc_text',
-        'thread_name': 'threadName',
-        'task_name': 'taskName',
-    }
-
-    def make_fields(self, record: logging.LogRecord) -> ta.Mapping[str, str]:
-        formatter_message = self.format(record)
-        if self._use_formatter_output:
-            message = formatter_message
-        else:
-            message = record.message
-
-        fields: dict[str, str] = {
-            'message': message,
-            'priority': str(SD_LOG_LEVEL_MAP[record.levelno]),
-            'tid': str(threading.get_ident()),
-        }
-
-        if (pathname := record.pathname) is not None:
-            fields['code_file'] = pathname
-        if (lineno := record.lineno) is not None:
-            fields['code_lineno'] = str(lineno)
-        if (func_name := record.funcName) is not None:
-            fields['code_func'] = func_name
-
-        for f, a in self.EXTRA_RECORD_ATTRS_BY_JOURNALD_FIELD.items():
-            if (v := getattr(record, a, None)) is not None:
-                fields[f] = str(v)
-
-        return fields
-
-    #
-
-    def emit(self, record: logging.LogRecord) -> None:
-        try:
-            fields = self.make_fields(record)
-
-            if rc := sd_journald_send(**fields):
-                raise RuntimeError(f'{self.__class__.__name__}.emit failed: {rc=}')  # noqa
-
-        except RecursionError:  # See issue 36272
-            raise
-
-        except Exception:  # noqa
-            self.handleError(record)
-
-
-def journald_log_handler_factory(
-        *,
-        no_tty_check: bool = False,
-        no_fallback: bool = False,
-) -> logging.Handler:
-    if (
-            sys.platform == 'linux' and
-            (no_tty_check or not sys.stderr.isatty()) and
-            (no_fallback or sd_try_libsystemd() is not None)
-    ):
-        return JournaldLogHandler()
-
-    return logging.StreamHandler()
-
-
 ########################################
 # ../../../omlish/lite/logs.py
 """
@@ -5565,6 +5408,163 @@ def check_runtime_version() -> None:
         raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
+########################################
+# ../../../omlish/os/journald.py
+
+
+##
+
+
+class sd_iovec(ct.Structure):  # noqa
+    pass
+
+
+sd_iovec._fields_ = [
+    ('iov_base', ct.c_void_p),  # Pointer to data.
+    ('iov_len', ct.c_size_t),  # Length of data.
+]
+
+
+##
+
+
+@cached_nullary
+def sd_libsystemd() -> ta.Any:
+    lib = ct.CDLL('libsystemd.so.0')
+
+    lib.sd_journal_sendv.restype = ct.c_int
+    lib.sd_journal_sendv.argtypes = [ct.POINTER(sd_iovec), ct.c_int]
+
+    return lib
+
+
+@cached_nullary
+def sd_try_libsystemd() -> ta.Optional[ta.Any]:
+    try:
+        return sd_libsystemd()
+    except OSError:  # noqa
+        return None
+
+
+##
+
+
+def sd_journald_send(**fields: str) -> int:
+    lib = sd_libsystemd()
+
+    msgs = [
+        f'{k.upper()}={v}\0'.encode('utf-8')
+        for k, v in fields.items()
+    ]
+
+    vec = (sd_iovec * len(msgs))()
+    cl = (ct.c_char_p * len(msgs))()  # noqa
+    for i in range(len(msgs)):
+        vec[i].iov_base = ct.cast(ct.c_char_p(msgs[i]), ct.c_void_p)
+        vec[i].iov_len = len(msgs[i]) - 1
+
+    return lib.sd_journal_sendv(vec, len(msgs))
+
+
+##
+
+
+SD_LOG_LEVEL_MAP: ta.Mapping[int, int] = {
+    logging.FATAL: syslog.LOG_EMERG,  # system is unusable
+    # LOG_ALERT ?  # action must be taken immediately
+    logging.CRITICAL: syslog.LOG_CRIT,
+    logging.ERROR: syslog.LOG_ERR,
+    logging.WARNING: syslog.LOG_WARNING,
+    # LOG_NOTICE ?  # normal but significant condition
+    logging.INFO: syslog.LOG_INFO,
+    logging.DEBUG: syslog.LOG_DEBUG,
+}
+
+
+class JournaldLogHandler(logging.Handler):
+    """
+    TODO:
+     - fallback handler for when this barfs
+    """
+
+    def __init__(
+            self,
+            *,
+            use_formatter_output: bool = False,
+    ) -> None:
+        super().__init__()
+
+        sd_libsystemd()
+
+        self._use_formatter_output = use_formatter_output
+
+    #
+
+    EXTRA_RECORD_ATTRS_BY_JOURNALD_FIELD: ta.ClassVar[ta.Mapping[str, str]] = {
+        'name': 'name',
+        'module': 'module',
+        'exception': 'exc_text',
+        'thread_name': 'threadName',
+        'task_name': 'taskName',
+    }
+
+    def make_fields(self, record: logging.LogRecord) -> ta.Mapping[str, str]:
+        formatter_message = self.format(record)
+        if self._use_formatter_output:
+            message = formatter_message
+        else:
+            message = record.message
+
+        fields: dict[str, str] = {
+            'message': message,
+            'priority': str(SD_LOG_LEVEL_MAP[record.levelno]),
+            'tid': str(threading.get_ident()),
+        }
+
+        if (pathname := record.pathname) is not None:
+            fields['code_file'] = pathname
+        if (lineno := record.lineno) is not None:
+            fields['code_lineno'] = str(lineno)
+        if (func_name := record.funcName) is not None:
+            fields['code_func'] = func_name
+
+        for f, a in self.EXTRA_RECORD_ATTRS_BY_JOURNALD_FIELD.items():
+            if (v := getattr(record, a, None)) is not None:
+                fields[f] = str(v)
+
+        return fields
+
+    #
+
+    def emit(self, record: logging.LogRecord) -> None:
+        try:
+            fields = self.make_fields(record)
+
+            if rc := sd_journald_send(**fields):
+                raise RuntimeError(f'{self.__class__.__name__}.emit failed: {rc=}')  # noqa
+
+        except RecursionError:  # See issue 36272
+            raise
+
+        except Exception:  # noqa
+            self.handleError(record)
+
+
+def journald_log_handler_factory(
+        *,
+        no_tty_check: bool = False,
+        no_fallback: bool = False,
+) -> logging.Handler:
+    if (
+            sys.platform == 'linux' and
+            (no_tty_check or not sys.stderr.isatty()) and
+            (no_fallback or sd_try_libsystemd() is not None)
+    ):
+        return JournaldLogHandler()
+
+    return logging.StreamHandler()
+
+
 ########################################
 # ../../configs.py
 

ominfra/supervisor/main.py

@@ -36,9 +36,9 @@ import typing as ta
 
 from omlish.http.coroserver import CoroHttpServer
 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.runtime import is_debugger_attached
+from omlish.os.journald import journald_log_handler_factory
 
 from ..configs import read_config_file
 from .configs import ServerConfig

{ominfra-0.0.0.dev150.dist-info → ominfra-0.0.0.dev152.dist-info}/METADATA

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

{ominfra-0.0.0.dev150.dist-info → ominfra-0.0.0.dev152.dist-info}/RECORD

@@ -17,7 +17,7 @@ ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViut
 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=xSK8rCgBNtSnuApBYWtVLdRrcKAtef87hgNqBcn8gGw,6113
+ominfra/clouds/aws/journald2aws/driver.py,sha256=b3XfSlIBWAWJLImmyh1ZK9FpdNAYNZ2YZeCv_Q9GckM,6111
 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
@@ -33,7 +33,7 @@ ominfra/manage/bootstrap.py,sha256=puGpmK6b6ZCAX5E_HI9ucUuWlXB4U_4Xwc2x8GAKSVo,2
 ominfra/manage/bootstrap_.py,sha256=WVry3P5ViPpdEC_-EFBouZTECMxs4CwRbek4Oz_iRbc,517
 ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
 ominfra/manage/inject.py,sha256=jGjGqlecpxzpJR3-RqQhEBOmpsix5UwSsvrz5DbayC4,1395
-ominfra/manage/main.py,sha256=wXeMx_lo6KQLSxRWACgdmrVlWGLUbs4qPJIyPWhzIH4,3898
+ominfra/manage/main.py,sha256=XtQNtFqTlm2hM225qBuhpri_B0Aeo1dezQhMJwfjotc,3860
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=LtaI0AgnplttQK7gNncNItq8yuTZQimJTaprVpZktI8,3993
@@ -47,7 +47,7 @@ ominfra/manage/deploy/command.py,sha256=CBzsw31u86wxkY9Ms-Es70ijD_3naZLAcj3Gb6Of
 ominfra/manage/deploy/inject.py,sha256=j5LYK5y_nZgdaNLde8sV2w_---GvmibgO_ZBT8qzeFM,499
 ominfra/manage/deploy/paths.py,sha256=Ad7OGERMqGUWO-0os1PXSO3sh9uGqrxxlEyT_3fYkac,3703
 ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/remote/_main.py,sha256=xxCKOu52b_a5BoH1mkHlof-PLn01QwKu928SKvlT9G0,4358
+ominfra/manage/remote/_main.py,sha256=7grHKEE72a6IHijwLV3uWbqnrl_v27ZNJSI3WWwGs7o,4356
 ominfra/manage/remote/channel.py,sha256=36xR9Ti9ZA8TUBtxmY0u7_3Lv7E6wzQTxlZl7gLR5GE,2224
 ominfra/manage/remote/config.py,sha256=zRIC7Yhh3FMfoIgyqlbDTwpL_jS23lhQXjGB2_YG4Eg,473
 ominfra/manage/remote/connection.py,sha256=5h-JrMK07Ulqgol3ZXmcTpSUr6iMu1oZd-wCjnRqe_Y,2821
@@ -56,9 +56,9 @@ ominfra/manage/remote/inject.py,sha256=euI9YmLTmNw7tdkQq_5PtFg6n9pYz3mGukOOApdYw
 ominfra/manage/remote/payload.py,sha256=Rn-Yo26POpHEOOfUHX3jWkqcQVEAvkJ_5Bu13jwoob4,944
 ominfra/manage/remote/spawning.py,sha256=bL87ted_lLwLW6DhrYPaXLRaIq7f6VYg_u2LJoMEpoE,3205
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=G4ZFbopI_TEOgy6CQGnfYk_ibbH3CMYwfd500e8_dLM,149423
-ominfra/scripts/manage.py,sha256=ohVW5YEjiN-yfY4jfmsiCuQkOdM63XPQzZlS06B6ZJM,194823
-ominfra/scripts/supervisor.py,sha256=D8DGUFcdp1SYUia_xx3HV-xeVE1DpYnwmSymZjYpuRU,262192
+ominfra/scripts/journald2aws.py,sha256=jLXI4iuMN1uRtRgCeyyczjwRl1pxKEgfbz1q8CJoUjc,149453
+ominfra/scripts/manage.py,sha256=17S7oz99WAEb9GRguohf6uEofd5WdcYhvM1ulgOmU6w,195440
+ominfra/scripts/supervisor.py,sha256=uPzXIfstv1J-LhDCKLx70RMUBQVA0zMkd7h4X18SAzQ,262206
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -72,7 +72,7 @@ ominfra/supervisor/groupsimpl.py,sha256=PCDyc_Wc-pnvIj56_aEyiA5exCpK6n9iErqnJzO2
 ominfra/supervisor/http.py,sha256=hysC2uFm5wWqi_MmOs1NrQ_UdwiXOawKEV-B37fwA-A,3445
 ominfra/supervisor/inject.py,sha256=6nBEnpE8VLjtYK12z5DGRP7WzgbwLAz5yf__1KnJl6g,4693
 ominfra/supervisor/io.py,sha256=moaGNaPuYXEAUzLg8Qjo05DEIcOUNYUj8SSr8eT0d24,3198
-ominfra/supervisor/main.py,sha256=BhAZJX_8KrH311URzz33i-XN4cChoqhKSbDgCcr4WSw,4248
+ominfra/supervisor/main.py,sha256=Pad43J0c6jvWGJqn3BAtIubD6MYuj261z-AgTuchvAs,4246
 ominfra/supervisor/pipes.py,sha256=2ZihNTnRNjnIPOtPbm3_pyqO15f7BNs7WnNtO5V8ahM,2231
 ominfra/supervisor/privileges.py,sha256=kaRTHI7XjqzxEWCeHp3_0J0Vc4gSPugRbXEwxuw6MYE,2054
 ominfra/supervisor/process.py,sha256=UaubVxsxVqDnbuWVpTH0DTGbJGLO0vGJ9mNcvy2kCXM,217
@@ -100,9 +100,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=h6akQJMl0KuWLHS7Ur6WcBZ2JwF0DJQhsPTnFBdGyNk,3571
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev150.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev150.dist-info/METADATA,sha256=FSLGLLhr0JDZ8cCgCbvNXg_oBIDz1xOt7VFEK-Nmsks,731
-ominfra-0.0.0.dev150.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev150.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev150.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev150.dist-info/RECORD,,
+ominfra-0.0.0.dev152.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev152.dist-info/METADATA,sha256=j1IeXSSy10gAqMN5hUB8Ab2oEDKYcYQyKEgvFkSnv3s,731
+ominfra-0.0.0.dev152.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev152.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev152.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev152.dist-info/RECORD,,