From 82797dd53cdf9b07154197818941b3fe244ca64a Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Mon, 17 May 2021 16:22:05 -0700 Subject: [PATCH] settings: Standardize the name of the deliver_scheduled_messages logs. This makes it match its command name, and other logfile name. --- puppet/zulip/files/logrotate/zulip | 2 +- zerver/management/commands/deliver_scheduled_messages.py | 2 +- zproject/computed_settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/puppet/zulip/files/logrotate/zulip b/puppet/zulip/files/logrotate/zulip index 5529819362..2858ef1b50 100644 --- a/puppet/zulip/files/logrotate/zulip +++ b/puppet/zulip/files/logrotate/zulip @@ -8,7 +8,7 @@ /var/log/zulip/ldap.log /var/log/zulip/manage.log /var/log/zulip/message_retention.log -/var/log/zulip/scheduled_message_deliverer.log +/var/log/zulip/deliver_scheduled_messages.log /var/log/zulip/send_email.log /var/log/zulip/smokescreen.log /var/log/zulip/slow_queries.log diff --git a/zerver/management/commands/deliver_scheduled_messages.py b/zerver/management/commands/deliver_scheduled_messages.py index 4be79c5838..91ba8bd277 100644 --- a/zerver/management/commands/deliver_scheduled_messages.py +++ b/zerver/management/commands/deliver_scheduled_messages.py @@ -15,7 +15,7 @@ from zerver.models import Message, ScheduledMessage, get_user_by_delivery_email ## Setup ## logger = logging.getLogger(__name__) -log_to_file(logger, settings.SCHEDULED_MESSAGE_DELIVERER_LOG_PATH) +log_to_file(logger, settings.DELIVER_SCHEDULED_MESSAGES_LOG_PATH) class Command(BaseCommand): diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py index e5f16e0e54..3771d246b4 100644 --- a/zproject/computed_settings.py +++ b/zproject/computed_settings.py @@ -695,7 +695,7 @@ WEBHOOK_LOG_PATH = zulip_path("/var/log/zulip/webhooks_errors.log") WEBHOOK_UNSUPPORTED_EVENTS_LOG_PATH = zulip_path("/var/log/zulip/webhooks_unsupported_events.log") SOFT_DEACTIVATION_LOG_PATH = zulip_path("/var/log/zulip/soft_deactivation.log") TRACEMALLOC_DUMP_DIR = zulip_path("/var/log/zulip/tracemalloc") -SCHEDULED_MESSAGE_DELIVERER_LOG_PATH = zulip_path("/var/log/zulip/scheduled_message_deliverer.log") +DELIVER_SCHEDULED_MESSAGES_LOG_PATH = zulip_path("/var/log/zulip/deliver_scheduled_messages.log") RETENTION_LOG_PATH = zulip_path("/var/log/zulip/message_retention.log") AUTH_LOG_PATH = zulip_path("/var/log/zulip/auth.log")