Remove logging.basicConfig call. (#88)

Author: Adam Grandquist

rethinkdb/logger.py

@@ -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
@@ -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):
         """

tests/test_logger.py

@@ -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'
@@ -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):
@@ -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):
@@ -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)