From 9f95446a55533c8cdceec7c4430be5cad752ecb1 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 25 Apr 2017 18:00:12 +0200
Subject: [bug] unify logging style using class attr

I changed most of the logger statements to use a class attribute, in
this way it's easier to identify which class it's logging them.

in some cases I leave a module-level logger, when we're either using
functions or when the module it's too small.

at the same time I did a general review and cleanup of the logging
statements.
---
 src/leap/bitmask/mail/smtp/__init__.py | 71 ----------------------------------
 1 file changed, 71 deletions(-)

(limited to 'src/leap/bitmask/mail/smtp/__init__.py')

diff --git a/src/leap/bitmask/mail/smtp/__init__.py b/src/leap/bitmask/mail/smtp/__init__.py
index 90baf668..e69de29b 100644
--- a/src/leap/bitmask/mail/smtp/__init__.py
+++ b/src/leap/bitmask/mail/smtp/__init__.py
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-# __init__.py
-# Copyright (C) 2013-2016 LEAP
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-SMTP gateway helper function.
-"""
-import os
-
-from twisted.internet import reactor
-from twisted.internet.error import CannotListenError
-from twisted.logger import Logger
-
-from leap.common.events import emit_async, catalog
-from leap.bitmask.mail.smtp.gateway import SMTPFactory
-
-logger = Logger()
-
-SMTP_PORT = 2013
-
-
-def run_service(soledad_sessions, keymanager_sessions, sendmail_opts,
-                port=SMTP_PORT, factory=None):
-    """
-    Main entry point to run the service from the client.
-
-    :param soledad_sessions: a dict-like object, containing instances
-                             of a Store (soledad instances), indexed by userid.
-    :param keymanager_sessions: a dict-like object, containing instances
-                                of Keymanager, indexed by userid.
-    :param sendmail_opts: a dict-like object of sendmailOptions.
-
-    :returns: the port as returned by the reactor when starts listening, and
-              the factory for the protocol.
-    :rtype: tuple
-    """
-    if not factory:
-        factory = SMTPFactory(soledad_sessions, keymanager_sessions,
-                              sendmail_opts)
-
-    try:
-        interface = "localhost"
-        # don't bind just to localhost if we are running on docker since we
-        # won't be able to access smtp from the host
-        if os.environ.get("LEAP_DOCKERIZED"):
-            interface = ''
-
-        # TODO Use Endpoints instead --------------------------------
-        tport = reactor.listenTCP(port, factory, interface=interface)
-        emit_async(catalog.SMTP_SERVICE_STARTED, str(port))
-
-        return tport, factory
-    except CannotListenError:
-        logger.error("SMTP Service failed to start: "
-                     "cannot listen in port %s" % port)
-        emit_async(catalog.SMTP_SERVICE_FAILED_TO_START, str(port))
-    except Exception as exc:
-        logger.error("Unhandled error while launching smtp gateway service")
-        logger.error('%r' % exc)
-- 
cgit v1.2.3