Merge pull request #17064 from gnossen/fix-logging

Fix logging

src/python/.gitignore

@@ -1,3 +1,4 @@
 gens/
 *_pb2.py
 *_pb2_grpc.py
+*.egg-info/

src/python/grpcio/grpc/_channel.py

@@ -24,8 +24,8 @@
 from grpc._cython import cygrpc
 from grpc.framework.foundation import callable_util
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 _USER_AGENT = 'grpc-python/{}'.format(_grpcio_metadata.__version__)
 

src/python/grpcio/grpc/_common.py

@@ -20,8 +20,8 @@
 import grpc
 from grpc._cython import cygrpc
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 CYGRPC_CONNECTIVITY_STATE_TO_CHANNEL_CONNECTIVITY = {
     cygrpc.ConnectivityState.idle:

src/python/grpcio/grpc/_cython/_cygrpc/grpc_string.pyx.pxi

@@ -14,8 +14,8 @@
 
 import logging
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 # This function will ascii encode unicode string inputs if neccesary.
 # In Python3, unicode strings are the default str type.

src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi

@@ -18,8 +18,8 @@ import logging
 import time
 import grpc
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 cdef class Server:
 

src/python/grpcio/grpc/_plugin_wrapping.py

@@ -20,8 +20,8 @@
 from grpc import _common
 from grpc._cython import cygrpc
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 
 class _AuthMetadataContext(

src/python/grpcio/grpc/_server.py

@@ -27,7 +27,6 @@
 from grpc._cython import cygrpc
 from grpc.framework.foundation import callable_util
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
 
 _SHUTDOWN_TAG = 'shutdown'

src/python/grpcio/grpc/framework/foundation/callable_util.py

@@ -21,8 +21,8 @@
 
 import six
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 
 class Outcome(six.with_metaclass(abc.ABCMeta)):

src/python/grpcio/grpc/framework/foundation/logging_pool.py

@@ -17,8 +17,8 @@
 
 from concurrent import futures
 
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 
 def _wrap(behavior):

src/python/grpcio/grpc/framework/foundation/stream_util.py

@@ -19,8 +19,8 @@
 from grpc.framework.foundation import stream
 
 _NO_VALUE = object()
-logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
+_LOGGER.addHandler(logging.NullHandler())
 
 
 class TransformingConsumer(stream.Consumer):

src/python/grpcio_tests/tests/interop/server.py

@@ -25,8 +25,8 @@
 from tests.interop import resources
 from tests.unit import test_common
 
-logging.basicConfig()
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
+logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
 
 

src/python/grpcio_tests/tests/tests.json

@@ -46,6 +46,7 @@
   "unit._interceptor_test.InterceptorTest",
   "unit._invalid_metadata_test.InvalidMetadataTest",
   "unit._invocation_defects_test.InvocationDefectsTest",
+  "unit._logging_test.LoggingTest",
   "unit._metadata_code_details_test.MetadataCodeDetailsTest",
   "unit._metadata_test.MetadataTest",
   "unit._reconnect_test.ReconnectTest",

src/python/grpcio_tests/tests/unit/BUILD.bazel

@@ -17,6 +17,7 @@ GRPCIO_TESTS_UNIT = [
     "_interceptor_test.py",
     "_invalid_metadata_test.py",
     "_invocation_defects_test.py",
+    "_logging_test.py",
     "_metadata_code_details_test.py",
     "_metadata_test.py",
     # TODO: Issue 16336

src/python/grpcio_tests/tests/unit/_api_test.py

@@ -14,6 +14,7 @@
 """Test of gRPC Python's application-layer API."""
 
 import unittest
+import logging
 
 import six
 
@@ -102,4 +103,5 @@ def test_secure_channel(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_auth_context_test.py

@@ -15,6 +15,7 @@
 
 import pickle
 import unittest
+import logging
 
 import grpc
 from grpc import _channel
@@ -187,4 +188,5 @@ def testSessionResumption(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_auth_test.py

@@ -16,6 +16,7 @@
 import collections
 import threading
 import unittest
+import logging
 
 from grpc import _auth
 
@@ -77,4 +78,5 @@ def mock_callback(metadata, error):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_channel_args_test.py

@@ -15,6 +15,7 @@
 
 from concurrent import futures
 import unittest
+import logging
 
 import grpc
 
@@ -62,4 +63,5 @@ def test_invalid_client_args(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_channel_close_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 """Tests server and client side compression."""
 
+import logging
 import threading
 import time
 import unittest
@@ -182,4 +183,5 @@ def sleep_some_time_then_close():
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_channel_connectivity_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 """Tests of grpc._channel.Channel connectivity."""
 
+import logging
 import threading
 import time
 import unittest
@@ -142,4 +143,5 @@ def test_reachable_then_unreachable_channel_connectivity(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_channel_ready_future_test.py

@@ -15,6 +15,7 @@
 
 import threading
 import unittest
+import logging
 
 import grpc
 from tests.unit.framework.common import test_constants
@@ -85,4 +86,5 @@ def test_immediately_connectable_channel_connectivity(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_compression_test.py

@@ -15,6 +15,7 @@
 
 import unittest
 
+import logging
 import grpc
 from grpc import _grpcio_metadata
 
@@ -117,4 +118,5 @@ def testStreaming(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_credentials_test.py

@@ -14,6 +14,7 @@
 """Tests of credentials."""
 
 import unittest
+import logging
 
 import grpc
 
@@ -54,4 +55,5 @@ def test_channel_credentials_composition(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_empty_message_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import unittest
+import logging
 
 import grpc
 
@@ -118,4 +119,5 @@ def testStreamStream(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_exit_scenarios.py

@@ -16,6 +16,7 @@
 import argparse
 import threading
 import time
+import logging
 
 import grpc
 
@@ -161,6 +162,7 @@ def infinite_request_iterator():
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     parser = argparse.ArgumentParser()
     parser.add_argument('scenario', type=str)
     parser.add_argument(

src/python/grpcio_tests/tests/unit/_exit_test.py

@@ -26,6 +26,7 @@
 import threading
 import time
 import unittest
+import logging
 
 from tests.unit import _exit_scenarios
 
@@ -187,4 +188,5 @@ def test_in_flight_partial_stream_stream_call(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_interceptor_test.py

@@ -17,6 +17,7 @@
 import itertools
 import threading
 import unittest
+import logging
 from concurrent import futures
 
 import grpc
@@ -598,4 +599,5 @@ def testInterceptedStreamRequestStreamResponse(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_invalid_metadata_test.py

@@ -14,6 +14,7 @@
 """Test of RPCs made against gRPC Python's application-layer API."""
 
 import unittest
+import logging
 
 import grpc
 
@@ -131,4 +132,5 @@ def testStreamRequestStreamResponse(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)

src/python/grpcio_tests/tests/unit/_invocation_defects_test.py

@@ -15,6 +15,7 @@
 import itertools
 import threading
 import unittest
+import logging
 
 import grpc
 
@@ -271,4 +272,5 @@ def testDefectiveGenericRpcHandlerUnaryResponse(self):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     unittest.main(verbosity=2)