From 2dc4621db044fdfda73dc3c1d047897b504d275a Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 19 Oct 2017 11:35:23 -0400 Subject: [PATCH] Move log_prefix up to be a class attribute --- openedx/core/djangoapps/schedules/resolvers.py | 14 +++----------- openedx/core/djangoapps/schedules/utils.py | 5 ++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py index b339b2a666..69c3e818ef 100644 --- a/openedx/core/djangoapps/schedules/resolvers.py +++ b/openedx/core/djangoapps/schedules/resolvers.py @@ -154,11 +154,7 @@ class ScheduleStartResolver(BinnedSchedulesBaseResolver): """ Send a message to all users whose schedule started at ``self.current_date`` + ``day_offset``. """ - - def __init__(self, *args, **kwargs): - super(ScheduleStartResolver, self).__init__(*args, **kwargs) - self.log_prefix = 'Scheduled Nudge' - + log_prefix = 'Scheduled Nudge' def schedule_bin( self, async_send_task, site_id, target_day_str, day_offset, bin_num, org_list, exclude_orgs=False, override_recipient_email=None, @@ -242,9 +238,7 @@ class UpgradeReminderResolver(BinnedSchedulesBaseResolver): """ Send a message to all users whose verified upgrade deadline is at ``self.current_date`` + ``day_offset``. """ - def __init__(self, *args, **kwargs): - super(UpgradeReminderResolver, self).__init__(*args, **kwargs) - self.log_prefix = 'Upgrade Reminder' + log_prefix = 'Upgrade Reminder' def schedule_bin( self, async_send_task, site_id, target_day_str, day_offset, bin_num, org_list, exclude_orgs=False, override_recipient_email=None, @@ -355,9 +349,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver): Send a message to all users whose schedule started at ``self.current_date`` + ``day_offset`` and the course has updates. """ - def __init__(self, *args, **kwargs): - super(CourseUpdateResolver, self).__init__(*args, **kwargs) - self.log_prefix = 'Course Update' + log_prefix = 'Course Update' def schedule_bin( self, async_send_task, site_id, target_day_str, day_offset, bin_num, org_list, exclude_orgs=False, override_recipient_email=None, diff --git a/openedx/core/djangoapps/schedules/utils.py b/openedx/core/djangoapps/schedules/utils.py index 5705d95d22..1364cebb2a 100644 --- a/openedx/core/djangoapps/schedules/utils.py +++ b/openedx/core/djangoapps/schedules/utils.py @@ -6,9 +6,12 @@ LOG = logging.getLogger(__name__) # TODO: consider using a LoggerAdapter instead of this mixin: # https://docs.python.org/2/library/logging.html#logging.LoggerAdapter class PrefixedDebugLoggerMixin(object): + log_prefix = None + def __init__(self, *args, **kwargs): super(PrefixedDebugLoggerMixin, self).__init__(*args, **kwargs) - self.log_prefix = self.__class__.__name__ + if self.log_prefix is None: + self.log_prefix = self.__class__.__name__ def log_debug(self, message, *args, **kwargs): LOG.debug(self.log_prefix + ': ' + message, *args, **kwargs)