diff --git a/zerver/decorator.py b/zerver/decorator.py index 4e014de65b..bcafa395fd 100644 --- a/zerver/decorator.py +++ b/zerver/decorator.py @@ -46,8 +46,7 @@ ViewFuncT = TypeVar('ViewFuncT', bound=Callable[..., HttpResponse]) ReturnT = TypeVar('ReturnT') ## logger setup -webhook_logger = create_logger( - "zulip.zerver.webhooks", settings.API_KEY_ONLY_WEBHOOK_LOG_PATH, 'DEBUG') +webhook_logger = create_logger("zulip.zerver.webhooks", settings.API_KEY_ONLY_WEBHOOK_LOG_PATH) class _RespondAsynchronously: pass diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index 22ed2b8741..4bc228af16 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -19,7 +19,7 @@ from zerver.context_processors import common_context from zerver.lib.queue import queue_json_publish from zerver.lib.logging_util import create_logger -logger = create_logger(__name__, settings.DIGEST_LOG_PATH, 'DEBUG') +logger = create_logger(__name__, settings.DIGEST_LOG_PATH) VALID_DIGEST_DAY = 1 # Tuesdays DIGEST_CUTOFF = 5 diff --git a/zerver/lib/logging_util.py b/zerver/lib/logging_util.py index b6505b72d2..2255064bb5 100644 --- a/zerver/lib/logging_util.py +++ b/zerver/lib/logging_util.py @@ -187,7 +187,6 @@ class ZulipFormatter(logging.Formatter): def create_logger(name: str, log_file: str, - log_level: Optional[str]=None, log_format: str="%(asctime)s%(levelname)-8s%(message)s") -> Logger: """Creates a named logger for use in logging content to a certain file. A few notes: @@ -201,9 +200,6 @@ def create_logger(name: str, logging.basicConfig(format=log_format) logger = logging.getLogger(name) - if log_level is not None: - logger.setLevel(getattr(logging, log_level)) - if log_file: formatter = logging.Formatter(log_format) file_handler = logging.FileHandler(log_file) diff --git a/zerver/management/commands/deliver_email.py b/zerver/management/commands/deliver_email.py index c55013dc6a..ae8cd1e6b0 100644 --- a/zerver/management/commands/deliver_email.py +++ b/zerver/management/commands/deliver_email.py @@ -24,7 +24,7 @@ from zerver.lib.send_email import EmailNotDeliveredException, send_email from zerver.models import ScheduledEmail ## Setup ## -logger = create_logger(__name__, settings.EMAIL_DELIVERER_LOG_PATH, 'DEBUG') +logger = create_logger(__name__, settings.EMAIL_DELIVERER_LOG_PATH) class Command(BaseCommand): help = """Deliver emails queued by various parts of Zulip diff --git a/zerver/management/commands/enqueue_digest_emails.py b/zerver/management/commands/enqueue_digest_emails.py index 9a7fe0cad0..9a16133866 100644 --- a/zerver/management/commands/enqueue_digest_emails.py +++ b/zerver/management/commands/enqueue_digest_emails.py @@ -9,7 +9,7 @@ from zerver.lib.digest import DIGEST_CUTOFF, enqueue_emails from zerver.lib.logging_util import create_logger ## Logging setup ## -logger = create_logger(__name__, settings.DIGEST_LOG_PATH, 'DEBUG') +logger = create_logger(__name__, settings.DIGEST_LOG_PATH) class Command(BaseCommand): help = """Enqueue digest emails for users that haven't checked the app diff --git a/zproject/settings.py b/zproject/settings.py index 770953db5a..18b44938d2 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -1389,6 +1389,15 @@ LOGGING = { }, # our own loggers, alphabetized + 'zerver.lib.digest': { + 'level': 'DEBUG', + }, + 'zerver.management.commands.deliver_email': { + 'level': 'DEBUG', + }, + 'zerver.management.commands.enqueue_digest_emails': { + 'level': 'DEBUG', + }, 'zulip.management': { 'handlers': ['file', 'errors_file'], 'propagate': False, @@ -1401,6 +1410,7 @@ LOGGING = { 'propagate': False, }, 'zulip.zerver.webhooks': { + 'level': 'DEBUG', 'handlers': ['file', 'errors_file'], 'propagate': False, },