Skip to content

Commit 59edb87

Browse files
committed
minor changes
1 parent 7c137c1 commit 59edb87

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

google/api_core/client_logging.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,24 @@
3737
# return json.dumps(log_obj)
3838

3939

40-
def setup_logging(log_level="CRITICAL", namespace="google"):
41-
if not logging.getLogger().hasHandlers():
40+
def setup_logging(log_level, namespace="google"):
41+
42+
# NOTE: A logger with namespace="google" is only configured if all of the below conditions hold true:
43+
# - A root logger is not configured.
44+
# - N/A: A logger with namespace="google" is not already configured (This statement is removed.)
45+
# - GOOGLE_SDK_PYTHON_LOGGING_LEVEL is set.
46+
if not logging.getLogger().hasHandlers() and log_level:
4247

4348
# define a module for our repositories
4449
logger = logging.getLogger(namespace)
45-
logger.setLevel(log_level)
50+
try:
51+
logger.setLevel(log_level)
52+
except ValueError:
53+
logger.setLevel("WARNING")
54+
logger.warning(f"Configured log level `{log_level}` is incorrect. Defaulting to WARNING.")
4655

4756
# Default settings
4857
console_handler = logging.StreamHandler()
49-
console_handler.setLevel(log_level)
5058
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
5159
console_handler.setFormatter(formatter)
5260
logger.addHandler(console_handler)

0 commit comments

Comments
 (0)