Skip to content

Commit 36523c8

Browse files
authored
feat: use module names for loggers (#136)
* feat: Use module names for loggers * style: Add space
1 parent 0af7d4a commit 36523c8

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

ibm_cloud_sdk_core/base_service.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
# http_client.HTTPConnection.debuglevel = 1
4141

4242

43+
logger = logging.getLogger(__name__)
44+
45+
4346
#pylint: disable=too-many-instance-attributes
4447
#pylint: disable=too-many-locals
4548
class BaseService:
@@ -295,7 +298,7 @@ def send(self, request: requests.Request, **kwargs) -> DetailedResponse:
295298
for key in reserved_keys:
296299
if key in kwargs:
297300
del kwargs[key]
298-
logging.warning('"%s" has been removed from the request', key)
301+
logger.warning('"%s" has been removed from the request', key)
299302
try:
300303
response = self.http_client.request(**request,
301304
cookies=self.jar,
@@ -320,7 +323,7 @@ def send(self, request: requests.Request, **kwargs) -> DetailedResponse:
320323

321324
raise ApiException(response.status_code, http_response=response)
322325
except requests.exceptions.SSLError:
323-
logging.exception(self.ERROR_MSG_DISABLE_SSL)
326+
logger.exception(self.ERROR_MSG_DISABLE_SSL)
324327
raise
325328

326329
def set_enable_gzip_compression(self,

ibm_cloud_sdk_core/token_managers/container_token_manager.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
from .iam_request_based_token_manager import IAMRequestBasedTokenManager
2121

2222

23+
logger = logging.getLogger(__name__)
24+
25+
2326
class ContainerTokenManager(IAMRequestBasedTokenManager):
2427
"""The ContainerTokenManager takes a compute resource token and performs the necessary interactions with
2528
the IAM token service to obtain and store a suitable bearer token. Additionally, the ContainerTokenManager
@@ -110,7 +113,7 @@ def retrieve_cr_token(self) -> str:
110113
"""
111114
cr_token_filename = self.cr_token_filename if self.cr_token_filename else self.DEFAULT_CR_TOKEN_FILENAME
112115

113-
logging.debug('Attempting to read CR token from file: %s',
116+
logger.debug('Attempting to read CR token from file: %s',
114117
cr_token_filename)
115118

116119
try:

ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
from .jwt_token_manager import JWTTokenManager
2222

2323

24+
logger = logging.getLogger(__name__)
25+
26+
2427
class VPCInstanceTokenManager(JWTTokenManager):
2528
"""The VPCInstanceTokenManager retrieves an "instance identity token" and exchanges that
2629
for an IAM access token using the VPC Instance Metadata Service API which is available
@@ -91,15 +94,15 @@ def request_token(self) -> dict:
9194
'Authorization': 'Bearer ' + instance_identity_token
9295
}
9396

94-
logging.debug(
97+
logger.debug(
9598
'Invoking VPC \'create_iam_token\' operation: %s', url)
9699
response = self._request(
97100
method='POST',
98101
url=url,
99102
headers=headers,
100103
params={'version': self.METADATA_SERVICE_VERSION},
101104
data=json.dumps(request_payload) if request_payload else None)
102-
logging.debug('Returned from VPC \'create_iam_token\' operation."')
105+
logger.debug('Returned from VPC \'create_iam_token\' operation."')
103106

104107
return response
105108

@@ -139,14 +142,14 @@ def retrieve_instance_identity_token(self) -> str:
139142

140143
request_body = {'expires_in': 300}
141144

142-
logging.debug(
145+
logger.debug(
143146
'Invoking VPC \'create_access_token\' operation: %s', url)
144147
response = self._request(
145148
method='PUT',
146149
url=url,
147150
headers=headers,
148151
params={'version': self.METADATA_SERVICE_VERSION},
149152
data=json.dumps(request_body))
150-
logging.debug('Returned from VPC \'create_access_token\' operation."')
153+
logger.debug('Returned from VPC \'create_access_token\' operation."')
151154

152155
return response['access_token']

0 commit comments

Comments
 (0)