Skip to content

Commit 101cfd3

Browse files
committed
remove interface and add setup
1 parent 10bb6ea commit 101cfd3

File tree

1 file changed

+44
-8
lines changed

1 file changed

+44
-8
lines changed

google/api_core/client_logging.py

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,52 @@
11
import logging
2+
import json
23

34

4-
class BaseLogger:
5+
# class BaseLogger:
56

6-
def __init__(self, log_level=logging.CRITICAL):
7-
self._logger = logging.getLogger("google")
8-
self._logger.setLevel(log_level)
7+
# def __init__(self, log_level=logging.DEBUG):
8+
# self._logger = logging.getLogger("google")
9+
# self._logger.setLevel(log_level)
10+
# console_handler = logging.StreamHandler()
11+
# console_handler.setLevel(log_level)
12+
# formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
13+
# # formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(user_id)s - %(request_id)s - %(message)s') # Include extra fields
14+
# # formatter = DefaultFormatter()
15+
# console_handler.setFormatter(formatter)
16+
# self._logger.addHandler(console_handler)
17+
18+
# def get_logger(self):
19+
# return self._logger
20+
21+
22+
class DefaultFormatter(logging.Formatter):
23+
def format(self, record):
24+
log_obj = {
25+
'timestamp': self.formatTime(record),
26+
'severity': record.levelname,
27+
'name': record.name,
28+
'message': record.getMessage(),
29+
}
30+
if hasattr(record, 'request'):
31+
log_obj['request'] = record.request
32+
if hasattr(record, 'response'):
33+
log_obj['response'] = record.response
34+
if hasattr(record, 'client_id'):
35+
log_obj['client_id'] = record.client_id
36+
37+
return json.dumps(log_obj)
38+
39+
40+
def setup_logging(log_level="DEBUG", namespace="google"):
41+
if not logging.getLogger().hasHandlers():
42+
43+
# define a module for our repositories
44+
logger = logging.getLogger(namespace)
45+
logger.setLevel(log_level)
46+
47+
# Default settings
948
console_handler = logging.StreamHandler()
1049
console_handler.setLevel(log_level)
1150
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
1251
console_handler.setFormatter(formatter)
13-
self._logger.addHandler(console_handler)
14-
15-
def get_logger(self):
16-
return self._logger
52+
logger.addHandler(console_handler)

0 commit comments

Comments
 (0)