Skip to content

Remove logging.basicConfig call. #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2019
Merged

Remove logging.basicConfig call. #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions rethinkdb/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ def __init__(self, level=logging.INFO):
"""

super(DriverLogger, self).__init__()
log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
logging.basicConfig(format=log_format)

self.logger = logging.getLogger()
self.logger = logging.getLogger(__name__)
self.logger.setLevel(level)

self.write_to_console = False
Expand All @@ -65,7 +63,7 @@ def _print_message(self, level, message):

def _log(self, level, message, *args, **kwargs):
self._print_message(level, message)
self.logger.log(level, message, args, kwargs)
self.logger.log(level, message, *args, **kwargs)

def debug(self, message):
"""
Expand Down
16 changes: 8 additions & 8 deletions tests/test_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import logging

import pytest
from mock import call, patch, ANY
from mock import call, patch
from rethinkdb.logger import DriverLogger


@pytest.mark.unit
class TestDriverLogger(object):
driver_logger = DriverLogger(logging.DEBUG)
logger = logging.getLogger()
logger = logging.getLogger("rethinkdb.logger")

def test_converter(self):
expected_message = 'converted message'
Expand Down Expand Up @@ -53,31 +53,31 @@ def test_log_debug(self):
with patch.object(self.logger, 'log') as mock_log:
self.driver_logger.debug(expected_message)

mock_log.assert_called_once_with(logging.DEBUG, expected_message, ANY, ANY)
mock_log.assert_called_once_with(logging.DEBUG, expected_message)

def test_log_info(self):
expected_message = 'info message'

with patch.object(self.logger, 'log') as mock_log:
self.driver_logger.info(expected_message)

mock_log.assert_called_once_with(logging.INFO, expected_message, ANY, ANY)
mock_log.assert_called_once_with(logging.INFO, expected_message)

def test_log_warning(self):
expected_message = 'warning message'

with patch.object(self.logger, 'log') as mock_log:
self.driver_logger.warning(expected_message)

mock_log.assert_called_once_with(logging.WARNING, expected_message, ANY, ANY)
mock_log.assert_called_once_with(logging.WARNING, expected_message)

def test_log_error(self):
expected_message = 'error message'

with patch.object(self.logger, 'log') as mock_log:
self.driver_logger.error(expected_message)

mock_log.assert_called_once_with(logging.ERROR, expected_message, ANY, ANY)
mock_log.assert_called_once_with(logging.ERROR, expected_message)

@patch('rethinkdb.logger.DriverLogger._convert_message')
def test_log_exception(self, mock_converter):
Expand All @@ -92,7 +92,7 @@ def test_log_exception(self, mock_converter):
self.driver_logger.exception(exc)

mock_converter.assert_called_once_with(expected_exception)
mock_log.assert_called_once_with(logging.ERROR, expected_message, ANY, {'exc_info':1})
mock_log.assert_called_once_with(logging.ERROR, expected_message, exc_info=1)

@patch('rethinkdb.logger.DriverLogger._convert_message')
def test_log_exception_and_raise(self, mock_converter):
Expand All @@ -105,4 +105,4 @@ def test_log_exception_and_raise(self, mock_converter):
self.driver_logger.exception(expected_exception, with_raise=True)

mock_converter.assert_called_once_with(expected_exception)
mock_log.assert_called_once_with(logging.ERROR, expected_message, ANY, {'exc_info':1})
mock_log.assert_called_once_with(logging.ERROR, expected_message, exc_info=1)