diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-06-12 14:34:18 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-06-22 15:52:37 -0300 |
| commit | 32658ae3108bc67a102cf6e0153d468b3a8ae1b0 (patch) | |
| tree | a0c70c2e19c9484210c132af35a80342d937290f /src/leap/bitmask/services/soledad | |
| parent | 584a6d93ad1fe1ba46929108f002a16a8b70e95d (diff) | |
[feat] replace old log handler with new one
Replace logging.getLogger with custom get_logger.
Remove some unneeded dependencies and reorder other.
Diffstat (limited to 'src/leap/bitmask/services/soledad')
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadconfig.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 9864e4e1..242bfb3d 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -17,7 +17,6 @@ """ Soledad bootstrapping """ -import logging import os import socket import sys @@ -32,6 +31,7 @@ from pysqlcipher.dbapi2 import ProgrammingError as sqlcipher_ProgrammingError from leap.bitmask.config import flags from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.crypto.srpauth import SRPAuth +from leap.bitmask.logs.utils import get_logger from leap.bitmask.services import download_service_config from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper from leap.bitmask.services.soledad.soledadconfig import SoledadConfig @@ -46,7 +46,7 @@ from leap.soledad.common.errors import InvalidAuthTokenError from leap.soledad.client import Soledad from leap.soledad.client.secrets import BootstrapSequenceError -logger = logging.getLogger(__name__) +logger = get_logger() """ These mocks are replicated from imap tests and the repair utility. diff --git a/src/leap/bitmask/services/soledad/soledadconfig.py b/src/leap/bitmask/services/soledad/soledadconfig.py index d3cc7da4..8052bcdb 100644 --- a/src/leap/bitmask/services/soledad/soledadconfig.py +++ b/src/leap/bitmask/services/soledad/soledadconfig.py @@ -17,12 +17,11 @@ """ Soledad configuration """ -import logging - +from leap.bitmask.logs.utils import get_logger from leap.bitmask.services import ServiceConfig from leap.bitmask.services.soledad.soledadspec import get_schema -logger = logging.getLogger(__name__) +logger = get_logger() class SoledadConfig(ServiceConfig): |