[Bugfix][Logging] Preserve application log record factories (#58747)
Signed-off-by: mgoin <mgoin64@gmail.com> Co-authored-by: OpenAI Codex <noreply@openai.com>
This commit is contained in:
co-authored by
OpenAI Codex
parent
522101f6ed
commit
d7f5722d7b
+19
-13
@@ -7,7 +7,7 @@ import json
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
from collections.abc import Generator, Hashable
|
||||
from collections.abc import Callable, Generator, Hashable
|
||||
from contextlib import contextmanager
|
||||
from copy import deepcopy
|
||||
from dataclasses import replace
|
||||
@@ -31,20 +31,24 @@ _FORMAT = (
|
||||
)
|
||||
_DATE_FORMAT = "%m-%d %H:%M:%S"
|
||||
|
||||
_base_log_record_factory = logging.getLogRecordFactory()
|
||||
_vllm_process_info: tuple[str, int] | None = None
|
||||
|
||||
|
||||
def _vllm_log_record_factory(*args: Any, **kwargs: Any) -> logging.LogRecord:
|
||||
"""Add vLLM process metadata to each log record."""
|
||||
record = _base_log_record_factory(*args, **kwargs)
|
||||
process_info = _vllm_process_info
|
||||
pid = os.getpid()
|
||||
if process_info is None or process_info[1] != pid:
|
||||
record.vllm_process_name = record.processName
|
||||
else:
|
||||
record.vllm_process_name = process_info[0]
|
||||
return record
|
||||
class _VllmLogRecordFactory:
|
||||
"""Add vLLM process metadata while preserving the wrapped record factory."""
|
||||
|
||||
def __init__(self, factory: Callable[..., logging.LogRecord]) -> None:
|
||||
self._factory = factory
|
||||
|
||||
def __call__(self, *args: Any, **kwargs: Any) -> logging.LogRecord:
|
||||
record = self._factory(*args, **kwargs)
|
||||
process_info = _vllm_process_info
|
||||
pid = os.getpid()
|
||||
if process_info is None or process_info[1] != pid:
|
||||
record.vllm_process_name = record.processName
|
||||
else:
|
||||
record.vllm_process_name = process_info[0]
|
||||
return record
|
||||
|
||||
|
||||
def set_vllm_process_name(process_name: str, *, skip_if_set: bool = False) -> None:
|
||||
@@ -220,7 +224,9 @@ def _configure_vllm_root_logger(config: "LoggingConfig | None" = None) -> None:
|
||||
)
|
||||
|
||||
if configure_logging:
|
||||
logging.setLogRecordFactory(_vllm_log_record_factory)
|
||||
factory = logging.getLogRecordFactory()
|
||||
if not isinstance(factory, _VllmLogRecordFactory):
|
||||
logging.setLogRecordFactory(_VllmLogRecordFactory(factory))
|
||||
logging_config = deepcopy(DEFAULT_LOGGING_CONFIG)
|
||||
|
||||
vllm_handler = logging_config["handlers"]["vllm"]
|
||||
|
||||
Reference in New Issue
Block a user