diff options
Diffstat (limited to 'service/pixelated')
-rw-r--r-- | service/pixelated/bitmask_libraries/smtp.py | 4 | ||||
-rw-r--r-- | service/pixelated/maintenance.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py index e05ba51a..643d4d4a 100644 --- a/service/pixelated/bitmask_libraries/smtp.py +++ b/service/pixelated/bitmask_libraries/smtp.py @@ -13,10 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import logging - - -logger = logging.getLogger(__name__) class LeapSMTPConfig(object): diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py index 5e5f8da0..4562717f 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import logging from os.path import isfile from mailbox import Maildir, mbox, MaildirMessage import random @@ -23,12 +22,15 @@ from twisted.internet.threads import deferToThread from pixelated.adapter.mailstore.maintenance import SoledadMaintenance from pixelated.config.leap import initialize_leap from pixelated.config import logger, arguments +import logging from leap.mail.constants import MessageFlags from pixelated.support.mail_generator import MailGenerator REPAIR_COMMAND = 'repair' +log = logging.getLogger(__name__) + def initialize(): args = arguments.parse_maintenance_args() @@ -72,7 +74,6 @@ def execute_command(args, leap_session): @defer.inlineCallbacks def soledad_sync(args): leap_session, soledad = args - log = logging.getLogger('some logger') log.warn('Before sync') |