jonas/alpinebits_python
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Updated reporting scheme. Should work better now

Browse Source
This commit is contained in:
Jonas Linter
2025-10-17 19:47:15 +02:00
parent 75f32234e0
commit f30632df29
6 changed files with 700 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/alpine_bits_python/logging_config.py
View File

@@ -25,7 +25,7 @@ def setup_logging(
pushover_service: "PushoverService | None" = None,
loop: asyncio.AbstractEventLoop | None = None,
enable_scheduler: bool = True,
) -> tuple["EmailAlertHandler | None", "DailyReportScheduler | None"]:
) -> tuple[logging.Handler | None, object | None]:
"""Configure logging based on application config.
Args:
@@ -37,7 +37,7 @@ def setup_logging(
(should be False for non-primary workers)
Returns:
Tuple of (email_alert_handler, daily_report_scheduler) if monitoring
Tuple of (alert_handler, daily_report_scheduler) if monitoring
is enabled, otherwise (None, None)
Logger config format:
@@ -92,88 +92,67 @@ def setup_logging(
root_logger.info("Logging configured at %s level", level)
# Setup notification monitoring if configured
email_handler = None
# Setup unified notification monitoring if configured
alert_handler = None
report_scheduler = None
# Setup email monitoring if configured
if email_service:
email_config = config.get("email", {})
monitoring_config = email_config.get("monitoring", {})
# Setup error alert handler
error_alerts_config = monitoring_config.get("error_alerts", {})
if error_alerts_config.get("enabled", False):
try:
# Import here to avoid circular dependencies
from alpine_bits_python.email_monitoring import EmailAlertHandler
email_handler = EmailAlertHandler(
email_service=email_service,
config=error_alerts_config,
loop=loop,
)
email_handler.setLevel(logging.ERROR)
root_logger.addHandler(email_handler)
root_logger.info("Email alert handler enabled for error monitoring")
except Exception:
root_logger.exception("Failed to setup email alert handler")
# Setup daily report scheduler (only if enabled and this is primary worker)
daily_report_config = monitoring_config.get("daily_report", {})
if daily_report_config.get("enabled", False) and enable_scheduler:
try:
# Import here to avoid circular dependencies
from alpine_bits_python.email_monitoring import DailyReportScheduler
report_scheduler = DailyReportScheduler(
email_service=email_service,
config=daily_report_config,
)
root_logger.info("Daily report scheduler configured (primary worker)")
except Exception:
root_logger.exception("Failed to setup daily report scheduler")
elif daily_report_config.get("enabled", False) and not enable_scheduler:
root_logger.info(
"Daily report scheduler disabled (non-primary worker)"
# Check if unified notifications are configured
notifications_config = config.get("notifications", {})
if notifications_config and (email_service or pushover_service):
try:
# Import here to avoid circular dependencies
from alpine_bits_python.notification_manager import (
get_notification_config,
setup_notification_service,
)
from alpine_bits_python.unified_monitoring import (
UnifiedAlertHandler,
UnifiedDailyReportScheduler,
)
# Check if Pushover daily reports are enabled
# If so and no report_scheduler exists yet, create one
if pushover_service and not report_scheduler:
pushover_config = config.get("pushover", {})
pushover_monitoring = pushover_config.get("monitoring", {})
pushover_daily_report = pushover_monitoring.get("daily_report", {})
if pushover_daily_report.get("enabled", False) and enable_scheduler:
try:
# Import here to avoid circular dependencies
from alpine_bits_python.email_monitoring import DailyReportScheduler
# Create a dummy config for the scheduler
# (it doesn't need email-specific fields if email is disabled)
scheduler_config = {
"send_time": pushover_daily_report.get("send_time", "08:00"),
"include_stats": pushover_daily_report.get("include_stats", True),
"include_errors": pushover_daily_report.get("include_errors", True),
"recipients": [], # Not used for Pushover
}
report_scheduler = DailyReportScheduler(
email_service=email_service, # Can be None
config=scheduler_config,
)
root_logger.info(
"Daily report scheduler configured for Pushover (primary worker)"
)
except Exception:
root_logger.exception("Failed to setup Pushover daily report scheduler")
elif pushover_daily_report.get("enabled", False) and not enable_scheduler:
root_logger.info(
"Pushover daily report scheduler disabled (non-primary worker)"
# Setup unified notification service
notification_service = setup_notification_service(
config=config,
email_service=email_service,
pushover_service=pushover_service,
)
return email_handler, report_scheduler
if notification_service:
# Setup error alert handler
error_alerts_config = get_notification_config("error_alerts", config)
if error_alerts_config.get("enabled", False):
try:
alert_handler = UnifiedAlertHandler(
notification_service=notification_service,
config=error_alerts_config,
loop=loop,
)
alert_handler.setLevel(logging.ERROR)
root_logger.addHandler(alert_handler)
root_logger.info("Unified alert handler enabled for error monitoring")
except Exception:
root_logger.exception("Failed to setup unified alert handler")
# Setup daily report scheduler (only if enabled and this is primary worker)
daily_report_config = get_notification_config("daily_report", config)
if daily_report_config.get("enabled", False) and enable_scheduler:
try:
report_scheduler = UnifiedDailyReportScheduler(
notification_service=notification_service,
config=daily_report_config,
)
root_logger.info("Unified daily report scheduler configured (primary worker)")
except Exception:
root_logger.exception("Failed to setup unified daily report scheduler")
elif daily_report_config.get("enabled", False) and not enable_scheduler:
root_logger.info(
"Unified daily report scheduler disabled (non-primary worker)"
)
except Exception:
root_logger.exception("Failed to setup unified notification monitoring")
return alert_handler, report_scheduler
def get_logger(name: str) -> logging.Logger: