This commit is contained in:
Ashwin Bharambe 2025-03-02 18:49:18 -08:00
parent 82d9d43b5d
commit 027f0862fd
2 changed files with 11 additions and 16 deletions

View file

@ -161,7 +161,10 @@ def init(default_level: int = logging.INFO) -> None:
def _should_log(level: int, category: str) -> bool: def _should_log(level: int, category: str) -> bool:
category_level = _category_levels.get(category.lower(), _default_level) category = category.lower()
if category not in _category_levels:
return False
category_level = _category_levels[category]
return level >= category_level return level >= category_level

View file

@ -16,15 +16,8 @@ class TestLogcat(unittest.TestCase):
def setUp(self): def setUp(self):
self.original_env = os.environ.get("LLAMA_STACK_LOGGING") self.original_env = os.environ.get("LLAMA_STACK_LOGGING")
self.original_handlers = list(logcat._logger.handlers)
self.original_level = logcat._logger.level
self.log_output = io.StringIO() self.log_output = io.StringIO()
self.handler = logging.StreamHandler(self.log_output) self._init_logcat()
self.handler.setFormatter(logging.Formatter("[%(category)s] %(message)s"))
logcat._logger.handlers.clear()
logcat._logger.addHandler(self.handler)
def tearDown(self): def tearDown(self):
if self.original_env is not None: if self.original_env is not None:
@ -32,12 +25,12 @@ class TestLogcat(unittest.TestCase):
else: else:
os.environ.pop("LLAMA_STACK_LOGGING", None) os.environ.pop("LLAMA_STACK_LOGGING", None)
def _init_logcat(self):
logcat.init(default_level=logging.DEBUG)
self.handler = logging.StreamHandler(self.log_output)
self.handler.setFormatter(logging.Formatter("[%(category)s] %(message)s"))
logcat._logger.handlers.clear() logcat._logger.handlers.clear()
for handler in self.original_handlers: logcat._logger.addHandler(self.handler)
logcat._logger.addHandler(handler)
logcat._logger.setLevel(self.original_level)
logcat._initialize()
def test_basic_logging(self): def test_basic_logging(self):
logcat.info("server", "Info message") logcat.info("server", "Info message")
@ -62,8 +55,7 @@ class TestLogcat(unittest.TestCase):
def test_env_var_control(self): def test_env_var_control(self):
os.environ["LLAMA_STACK_LOGGING"] = "server=debug;inference=warning" os.environ["LLAMA_STACK_LOGGING"] = "server=debug;inference=warning"
self._init_logcat()
logcat._initialize()
# These should be visible based on the environment settings # These should be visible based on the environment settings
logcat.debug("server", "Server debug message") logcat.debug("server", "Server debug message")