omlish 0.0.0.dev118__tar.gz → 0.0.0.dev119__tar.gz

{omlish-0.0.0.dev118/omlish.egg-info → omlish-0.0.0.dev119}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev118
+Version: 0.0.0.dev119
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev118'
-__revision__ = '3d4642bb79ba8bc7d7c6a1009237095185ac3c86'
+__version__ = '0.0.0.dev119'
+__revision__ = 'abf03cc06fe1610ddf750a1392aa9c9de00acfd3'
 
 
 #

omlish-0.0.0.dev119/omlish/lite/journald.py

@@ -0,0 +1,163 @@
+# ruff: noqa: UP007 UP012
+import ctypes as ct
+import logging
+import sys
+import syslog
+import threading
+import typing as ta
+
+from .cached import cached_nullary
+
+
+##
+
+
+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 = lib['sd_journal_sendv']  # type: ignore
+    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-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish/lite/logs.py

@@ -91,7 +91,7 @@ class StandardLogFormatter(logging.Formatter):
         if datefmt:
             return ct.strftime(datefmt)  # noqa
         else:
-            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            t = ct.strftime('%Y-%m-%d %H:%M:%S')
             return '%s.%03d' % (t, record.msecs)
 
 
@@ -228,6 +228,7 @@ def configure_standard_logging(
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
+        handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
 ) -> ta.Optional[StandardLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -241,7 +242,10 @@ def configure_standard_logging(
 
         #
 
-        handler = logging.StreamHandler()
+        if handler_factory is not None:
+            handler = handler_factory()
+        else:
+            handler = logging.StreamHandler()
 
         #
 

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish/logs/_abc.py

@@ -16,27 +16,80 @@ ExceptionInfo: ta.TypeAlias = tuple[type[BaseException], BaseException, types.Tr
 
 
 class LogRecord:
+    """https://docs.python.org/3/library/logging.html#logrecord-attributes"""
+
+    # Name of the logger used to log the call.
     name: str
+
+    # Human-readable time when the LogRecord was created. By default this is of the form '2003-07-08 16:49:45,896' (the
+    # numbers after the comma are millisecond portion of the time).
+    asctime: str
+
+    # The logged message, computed as msg % args. This is set when Formatter.format() is invoked.
+    message: str
+
+    # The format string passed in the original logging call. Merged with args to produce message, or an arbitrary object
+    # (see Using arbitrary objects as messages).
     msg: str
+
+    # The tuple of arguments merged into msg to produce message, or a dict whose values are used for the merge (when
+    # there is only one argument, and it is a dictionary).
     args: tuple
+
+    # Text logging level for the message ('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL').
     levelname: str
+
+    # # Numeric logging level for the message (DEBUG, INFO, WARNING, ERROR, CRITICAL).
     levelno: Level
+
+    # Full pathname of the source file where the logging call was issued (if available).
     pathname: str
+
+    # Filename portion of pathname.
     filename: str
+
+    # Module (name portion of filename).
     module: str
+
+    # Exception tuple (à la sys.exc_info) or, if no exception has occurred, None.
     exc_info: ExceptionInfo | None
+
     exc_text: str | None
+
+    # Stack frame information (where available) from the bottom of the stack in the current thread, up to and including
+    # the stack frame of the logging call which resulted in the creation of this record.
     stack_info: str | None
+
+    # Source line number where the logging call was issued (if available).
     lineno: int
+
+    # Name of function containing the logging call.
     funcName: str
+
+    # Time when the LogRecord was created (as returned by time.time_ns() / 1e9).
     created: float
+
+    # Millisecond portion of the time when the LogRecord was created.
     msecs: float
+
+    # Time in milliseconds when the LogRecord was created, relative to the time the logging module was loaded.
     relativeCreated: float
+
+    # Thread ID (if available).
     thread: int
+
+    # Thread name (if available).
     threadName: str
+
+    # Process name (if available).
     processName: str
+
+    # Process ID (if available).
     process: int
 
+    # asyncio.Task name (if available).
+    taskName: str
+
 
 ##
 

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish/logs/handlers.py

@@ -6,5 +6,5 @@ class ListHandler(logging.Handler):
         super().__init__()
         self.records: list[logging.LogRecord] = []
 
-    def emit(self, record):
+    def emit(self, record: logging.LogRecord) -> None:
         self.records.append(record)

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish/testing/pytest/plugins/pydevd.py

@@ -16,9 +16,9 @@ class PydevdPlugin:
             # if (dbg := opd.get_global_debugger()) is not None:
             #     dbg.set_unit_tests_debugging_mode()
 
-    def pytest_exception_interact(self, node, call, report):
-        if opd.get_setup() is not None:
-            if not node.session.config.option.no_pydevd:
-                opd.debug_unhandled_exception(call.excinfo._excinfo)  # noqa
-
-        return report
+    # def pytest_exception_interact(self, node, call, report):
+    #     if opd.get_setup() is not None:
+    #         if not node.session.config.option.no_pydevd:
+    #             opd.debug_unhandled_exception(call.excinfo._excinfo)  # noqa
+    #
+    #     return report

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev118
+Version: 0.0.0.dev119
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/omlish.egg-info/SOURCES.txt

@@ -313,6 +313,7 @@ omlish/lite/check.py
 omlish/lite/contextmanagers.py
 omlish/lite/docker.py
 omlish/lite/io.py
+omlish/lite/journald.py
 omlish/lite/json.py
 omlish/lite/logs.py
 omlish/lite/marshal.py

{omlish-0.0.0.dev118 → omlish-0.0.0.dev119}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev118'
+version = '0.0.0.dev119'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',