evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change logging to do rollover() instead of rotate() (#55177)

Browse source 
* Change to rollover from rotate.

* Remove test log files.
This commit is contained in:
jan iversen 2021-08-25 17:32:48 +02:00 • committed by GitHub
parent d984e137b8
commit 3a0a8da648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -2,7 +2,7 @@ config/*
config2/* config2/*
tests/testing_config/deps tests/testing_config/deps
tests/testing_config/home-assistant.log tests/testing_config/home-assistant.log*
# hass-release # hass-release
data/ data/

4
homeassistant/bootstrap.py
View file

@ -332,7 +332,7 @@ def async_enable_logging(
not err_path_exists and os.access(err_dir, os.W_OK) not err_path_exists and os.access(err_dir, os.W_OK)
): ):
err_handler: logging.FileHandler err_handler: logging.handlers.RotatingFileHandler | logging.handlers.TimedRotatingFileHandler
if log_rotate_days: if log_rotate_days:
err_handler = logging.handlers.TimedRotatingFileHandler( err_handler = logging.handlers.TimedRotatingFileHandler(
err_log_path, when="midnight", backupCount=log_rotate_days err_log_path, when="midnight", backupCount=log_rotate_days
@ -342,7 +342,7 @@ def async_enable_logging(
err_log_path, backupCount=1 err_log_path, backupCount=1
) )
err_handler.rotate(err_log_path, f"{err_log_path[:-4]}.previous.log") err_handler.doRollover()
err_handler.setLevel(logging.INFO if verbose else logging.WARNING) err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt)) err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))

5
tests/test_bootstrap.py
View file

@ -1,6 +1,7 @@
"""Test the bootstrapping.""" """Test the bootstrapping."""
# pylint: disable=protected-access # pylint: disable=protected-access
import asyncio import asyncio
import glob
import os import os
from unittest.mock import Mock, patch from unittest.mock import Mock, patch
@ -69,6 +70,10 @@ async def test_async_enable_logging(hass):
log_file="test.log", log_file="test.log",
) )
mock_async_activate_log_queue_handler.assert_called_once() mock_async_activate_log_queue_handler.assert_called_once()
for f in glob.glob("test.log*"):
os.remove(f)
for f in glob.glob("testing_config/home-assistant.log*"):
os.remove(f)
async def test_load_hassio(hass): async def test_load_hassio(hass):