Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-21 08:21:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

logging improvements (#2073)

Browse Source 
* Scheduled tasks log to Debug, not Info

* Add LOG_LEVEL config to .env

* Update some other log levels and fix typos

* fix logger initializer

---------

Co-authored-by: Jakob Rubin <647846+Grygon@users.noreply.github.com>
This commit is contained in:
Hayden
2023-01-28 16:54:44 -09:00
committed by GitHub
parent 9ddb27b2e3
commit 530f7c9d6b
13 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mealie/services/scheduler/scheduler_registry.py
View File

@@ -17,7 +17,7 @@ class SchedulerRegistry:
@staticmethod
def _register(name: str, callbacks: list[Callable], callback: Iterable[Callable]):
for cb in callback:
logger.info(f"Registering {name} callback: {cb.__name__}")
logger.debug(f"Registering {name} callback: {cb.__name__}")
callbacks.append(cb)
@staticmethod
@@ -26,7 +26,7 @@ class SchedulerRegistry:
@staticmethod
def remove_daily(callback: Callable):
logger.info(f"Removing daily callback: {callback.__name__}")
logger.debug(f"Removing daily callback: {callback.__name__}")
SchedulerRegistry._daily.remove(callback)
@staticmethod
@@ -35,7 +35,7 @@ class SchedulerRegistry:
@staticmethod
def remove_hourly(callback: Callable):
logger.info(f"Removing hourly callback: {callback.__name__}")
logger.debug(f"Removing hourly callback: {callback.__name__}")
SchedulerRegistry._hourly.remove(callback)
@staticmethod
@@ -44,16 +44,16 @@ class SchedulerRegistry:
@staticmethod
def remove_minutely(callback: Callable):
logger.info(f"Removing minutely callback: {callback.__name__}")
logger.debug(f"Removing minutely callback: {callback.__name__}")
SchedulerRegistry._minutely.remove(callback)
@staticmethod
def print_jobs():
for job in SchedulerRegistry._daily:
logger.info(f"Daily job: {job.__name__}")
logger.debug(f"Daily job: {job.__name__}")
for job in SchedulerRegistry._hourly:
logger.info(f"Hourly job: {job.__name__}")
logger.debug(f"Hourly job: {job.__name__}")
for job in SchedulerRegistry._minutely:
logger.info(f"Minutely job: {job.__name__}")
logger.debug(f"Minutely job: {job.__name__}")

6
mealie/services/scheduler/scheduler_service.py
View File

@@ -31,20 +31,20 @@ def _scheduled_task_wrapper(callable):
@repeat_every(minutes=MINUTES_DAY, wait_first=True, logger=logger)
def run_daily():
logger.info("Running daily callbacks")
logger.debug("Running daily callbacks")
for func in SchedulerRegistry._daily:
_scheduled_task_wrapper(func)
@repeat_every(minutes=MINUTES_HOUR, wait_first=True, logger=logger)
def run_hourly():
logger.info("Running hourly callbacks")
logger.debug("Running hourly callbacks")
for func in SchedulerRegistry._hourly:
_scheduled_task_wrapper(func)
@repeat_every(minutes=MINUTES_5, wait_first=True, logger=logger)
def run_minutely():
logger.info("Running minutely callbacks")
logger.debug("Running minutely callbacks")
for func in SchedulerRegistry._minutely:
_scheduled_task_wrapper(func)

4
mealie/services/scheduler/tasks/purge_group_exports.py
View File

@@ -13,7 +13,7 @@ def purge_group_data_exports(max_minutes_old=ONE_DAY_AS_MINUTES):
"""Purges all group exports after x days"""
logger = root_logger.get_logger()
logger.info("purging group data exports")
logger.debug("purging group data exports")
limit = datetime.datetime.now() - datetime.timedelta(minutes=max_minutes_old)
with session_context() as session:
@@ -41,6 +41,6 @@ def purge_excess_files() -> None:
# TODO: fix comparison types
if file.stat().st_mtime < limit: # type: ignore
file.unlink()
logger.info(f"excess group file removed '{file}'")
logger.debug(f"excess group file removed '{file}'")
logger.info("finished purging excess files")

4
mealie/services/scheduler/tasks/purge_password_reset.py
View File

@@ -11,11 +11,11 @@ MAX_DAYS_OLD = 2
def purge_password_reset_tokens():
"""Purges all events after x days"""
logger.info("purging password reset tokens")
logger.debug("purging password reset tokens")
limit = datetime.datetime.now() - datetime.timedelta(days=MAX_DAYS_OLD)
with session_context() as session:
session.query(PasswordResetModel).filter(PasswordResetModel.created_at <= limit).delete()
session.commit()
session.close()
logger.info("password reset tokens purges")
logger.info("password reset tokens purged")

2
mealie/services/scheduler/tasks/purge_registration.py
View File

@@ -11,7 +11,7 @@ MAX_DAYS_OLD = 4
def purge_group_registration():
"""Purges all events after x days"""
logger.info("purging expired registration tokens")
logger.debug("purging expired registration tokens")
limit = datetime.datetime.now() - datetime.timedelta(days=MAX_DAYS_OLD)
with session_context() as session:

4
mealie/services/scheduler/tasks/reset_locked_users.py
View File

@@ -6,12 +6,12 @@ from mealie.services.user_services.user_service import UserService
def locked_user_reset():
logger = root_logger.get_logger()
logger.info("resetting locked users")
logger.debug("resetting locked users")
with session_context() as session:
repos = AllRepositories(session)
user_service = UserService(repos)
unlocked = user_service.reset_locked_users()
logger.info(f"scheduled task unlocked {unlocked} users in the database")
logger.debug(f"scheduled task unlocked {unlocked} users in the database")
logger.info("locked users reset")