summaryrefslogtreecommitdiff
path: root/src/leap/soledad/server/_incoming.py
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-11-13 23:10:10 -0200
committerdrebs <drebs@riseup.net>2017-11-14 19:01:15 -0200
commit1aa09423eea6849a14cd0a36345ef088f34e469a (patch)
tree8ead6772d55006104cc1eea30d13854a0a13966f /src/leap/soledad/server/_incoming.py
parent7bda8b8396756eeaf6635a0183372a9962f51c53 (diff)
[bug] use custom logger everywhere in server
Diffstat (limited to 'src/leap/soledad/server/_incoming.py')
-rw-r--r--src/leap/soledad/server/_incoming.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/leap/soledad/server/_incoming.py b/src/leap/soledad/server/_incoming.py
index 1ccf74df..e4ca4de8 100644
--- a/src/leap/soledad/server/_incoming.py
+++ b/src/leap/soledad/server/_incoming.py
@@ -19,26 +19,29 @@ A twisted resource that saves externally delivered documents into user's db.
"""
import json
import base64
-from twisted.logger import Logger
+
+from io import BytesIO
from twisted.web.server import NOT_DONE_YET
from twisted.web.resource import Resource
from twisted.web.test.test_web import DummyRequest
-from ._config import get_config
-from io import BytesIO
-from leap.soledad.server._blobs import BlobsServerState
-from leap.soledad.common.couch.state import CouchServerState
-from leap.soledad.common.document import ServerDocument
+
from leap.soledad.common.blobs import Flags
+from leap.soledad.common.blobs import preamble
+from leap.soledad.common.couch.state import CouchServerState
from leap.soledad.common.crypto import ENC_JSON_KEY
from leap.soledad.common.crypto import ENC_SCHEME_KEY
from leap.soledad.common.crypto import EncryptionSchemes
-from leap.soledad.common.blobs import preamble
+from leap.soledad.common.document import ServerDocument
+from leap.soledad.common.log import getLogger
+
+from leap.soledad.server._config import get_config
+from leap.soledad.server._blobs import BlobsServerState
__all__ = ['IncomingResource']
-logger = Logger()
+logger = getLogger(__name__)
def _get_backend_from_config():