analytics: Move logging config into LOGGING, use "zulip.analytics".

This should not reuse (and reconfigure!) the "zulip.management"
logger.
This commit is contained in:
Alex Vandiver 2023-11-17 18:40:09 +00:00 committed by Tim Abbott
parent efa9bf36eb
commit 7233841171
2 changed files with 12 additions and 4 deletions

View File

@ -19,7 +19,6 @@ from analytics.models import (
UserCount,
installation_epoch,
)
from zerver.lib.logging_util import log_to_file
from zerver.lib.timestamp import ceiling_to_day, ceiling_to_hour, floor_to_hour, verify_UTC
from zerver.models import Message, Realm, RealmAuditLog, Stream, UserActivityInterval, UserProfile
@ -31,10 +30,9 @@ if settings.ZILENCER_ENABLED:
RemoteZulipServer,
)
## Logging setup ##
logger = logging.getLogger("zulip.management")
log_to_file(logger, settings.ANALYTICS_LOG_PATH)
logger = logging.getLogger("zulip.analytics")
# You can't subtract timedelta.max from a datetime, so use this instead
TIMEDELTA_MAX = timedelta(days=365 * 1000)

View File

@ -763,6 +763,12 @@ LOGGING: Dict[str, Any] = {
else []
),
},
"analytics_file": {
"level": "DEBUG",
"class": "logging.handlers.WatchedFileHandler",
"formatter": "default",
"filename": ANALYTICS_LOG_PATH,
},
"auth_file": {
"level": "DEBUG",
"class": "logging.handlers.WatchedFileHandler",
@ -929,6 +935,10 @@ LOGGING: Dict[str, Any] = {
"zerver.management.commands.deliver_scheduled_messages": {
"level": "DEBUG",
},
"zulip.analytics": {
"handlers": ["analytics_file", "errors_file"],
"propagate": False,
},
"zulip.auth": {
"level": "DEBUG",
"handlers": [*DEFAULT_ZULIP_HANDLERS, "auth_file"],