summaryrefslogtreecommitdiff
path: root/service/pixelated/application.py
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2016-10-05 19:12:52 -0300
committerTulio Casagrande <tcasagra@thoughtworks.com>2016-10-05 19:12:52 -0300
commite63f6cfb89a40c7f547d6b75fa208e9a0bc05f36 (patch)
tree969c73fe7d9a89c7f5be92d5cff4edbeee44c10f /service/pixelated/application.py
parent061d9438bec2552bd083b7c03ac461742dd10801 (diff)
Move the application.py to twisted logger
Diffstat (limited to 'service/pixelated/application.py')
-rw-r--r--service/pixelated/application.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index fe74790b..243b0267 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.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
import os
from OpenSSL import SSL
@@ -22,6 +21,7 @@ from OpenSSL import crypto
from leap.common.events import (server as events_server,
register, catalog as events)
from leap.soledad.common.errors import InvalidAuthTokenError
+from twisted.logger import Logger
from twisted.conch import manhole_tap
from twisted.cred import portal
from twisted.cred.checkers import AllowAnonymousAccess, FilePasswordDB
@@ -43,8 +43,7 @@ from pixelated.resources.login_resource import LoginResource
from pixelated.resources.root_resource import RootResource
from pixelated.support.loglinegenerator import ILogLineGenerator
-log = logging.getLogger(__name__)
-
+log = Logger()
class UserAgentMode(object):
def __init__(self, is_single_user):