modify add_logger

Author: wallisyan

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/access_key_signer.py

@@ -30,7 +30,6 @@ def __init__(self, access_key_credential):
         self._credential = access_key_credential
 
     def sign(self, region_id, request):
-        logger.debug("Calculating signature using AccessKey.")
         cred = self._credential
         header = request.get_signed_header(region_id, cred.access_key_id, cred.access_key_secret)
         url = request.get_url(region_id, cred.access_key_id, cred.access_key_secret)

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py

@@ -39,7 +39,6 @@ def __init__(self, ecs_ram_role_credential):
         self._expiration = 0
 
     def sign(self, region_id, request):
-        logger.debug("Calculating signature using EcsRamRole.")
         self._check_session_credential()
         session_ak, session_sk, token = self._session_credential
         if request.get_style() == 'RPC':

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/ram_role_arn_signer.py

@@ -50,7 +50,6 @@ def __init__(self, credential, do_action_api):
                 self._credential.session_role_name = "aliyun-python-sdk-" + str(time.time())
 
     def sign(self, region_id, request):
-        logger.debug("Calculating signature using RamRoleArn.")
         self._check_session_credential()
         session_ak, session_sk, token = self._session_credential
         if request.get_style() == 'RPC':

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/rsa_key_pair_signer.py

@@ -39,7 +39,6 @@ def __init__(self, credential, region_id, debug=False):
         self._session_credential = None
 
     def sign(self, region_id, request):
-        logger.debug("Calculating signature using RsaKeyPair.")
         self._check_session_credential()
         session_ak, session_sk = self._session_credential
         header = request.get_signed_header(region_id, session_ak, session_sk)

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/sts_token_signer.py

@@ -31,7 +31,6 @@ def __init__(self, sts_credential):
         self._credential = sts_credential
 
     def sign(self, region_id, request):
-        logger.debug("Calculating signature using StsToken.")
         sts_cred = self._credential
         if request.get_style() == 'RPC':
             request.add_query_param("SecurityToken", sts_cred.sts_token)

aliyun-python-sdk-core/aliyunsdkcore/client.py

@@ -23,6 +23,7 @@
 import json
 import logging
 import jmespath
+import copy
 
 import aliyunsdkcore
 from aliyunsdkcore.vendored.six.moves.urllib.parse import urlencode
@@ -59,7 +60,7 @@
 
 
 class AcsClient:
-    LOG_FORMAT = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    LOG_FORMAT = '%(thread)d %(asctime)s %(name)s %(levelname)s %(message)s'
 
     def __init__(
             self,
@@ -270,10 +271,10 @@ def _handle_retry_and_timeout(self, endpoint, request, signer):
             retryable = self._retry_policy.should_retry(retry_policy_context)
             if retryable & RetryCondition.NO_RETRY:
                 break
-            logger.debug("Retry needed, request is: %s", request.get_action_name())
+            logger.debug("Retry needed Request:%s Retries :%d",
+                         request.get_action_name(), retries)
             retry_policy_context.retryable = retryable
             time_to_sleep = self._retry_policy.compute_delay_before_next_retry(retry_policy_context)
-            logger.debug('Retry %s times', retries)
             time.sleep(time_to_sleep / 1000.0)
             retries += 1
 
@@ -284,20 +285,18 @@ def _handle_retry_and_timeout(self, endpoint, request, signer):
 
     def _handle_single_request(self, endpoint, request, timeout, signer):
         http_response = self._make_http_response(endpoint, request, timeout, signer)
-        params = request.get_query_params()
+        params = copy.deepcopy(request.get_query_params())
         params.pop('AccessKeyId', None)
-        logger.debug('The request params are %s', str(params))
+        logger.debug('Request params are %s', str(params))
 
         # Do the actual network thing
         try:
             status, headers, body = http_response.get_response_object()
         except IOError as e:
-            error_message = str(e)
-            error_message += "\nEndpoint: " + endpoint
-            logger.error('Catch a HttpError when connect to %s, current sdk version is %s',
-                         endpoint, aliyunsdkcore.__version__, exc_info=True)
+            logger.error("HttpError occurred Host:%s SDK-Version:%s",
+                         endpoint, aliyunsdkcore.__version__)
 
-            exception = ClientException(error_code.SDK_HTTP_ERROR, error_message)
+            exception = ClientException(error_code.SDK_HTTP_ERROR, str(e))
             return None, None, None, exception
 
         exception = self._get_server_exception(status, body)
@@ -316,7 +315,7 @@ def _parse_error_info_from_response_body(response_body):
                 error_message_to_return = body_obj['Message']
         except ValueError:
             # failed to parse body as json format
-            logger.warning('failed to parse response body as json format')
+            logger.warning('Failed to parse Response:%s as json format.', response_body)
 
         return error_code_to_return, error_message_to_return
 
@@ -329,7 +328,7 @@ def _get_server_exception(self, http_status, response_body):
         except (ValueError, TypeError, AttributeError):
             # in case the response body is not a json string, return the raw
             # data instead
-            logger.warning('failed to parse response body as json format')
+            logger.warning('Failed to parse Response:%s as json format.', response_body)
 
         if http_status < codes.OK or http_status >= codes.MULTIPLE_CHOICES:
 

aliyun-python-sdk-core/aliyunsdkcore/retry/retry_condition.py

@@ -62,8 +62,8 @@ def should_retry(self, retry_policy_context):
         if retry_policy_context.retries_attempted < self.max_retry_times:
             return RetryCondition.SHOULD_RETRY
         else:
-            logger.debug("Reached the maximum number of retry "
-                         "attempts: %s", retry_policy_context.retries_attempted)
+            logger.debug("Reached the maximum number of retry,Attempts:%d",
+                         retry_policy_context.retries_attempted)
             return RetryCondition.NO_RETRY
 
 
@@ -78,7 +78,7 @@ def should_retry(self, retry_policy_context):
 
         if isinstance(exception, ClientException):
             if exception.get_error_code() == error_code.SDK_HTTP_ERROR:
-                logger.debug("Retry needed, retryable ClientException caught: %s",
+                logger.debug("Retryable ClientException occurred,ClientException:%s",
                              exception, exc_info=True)
                 return RetryCondition.SHOULD_RETRY
 
@@ -88,15 +88,15 @@ def should_retry(self, retry_policy_context):
                                                        request,
                                                        self.retry_config)
             if isinstance(normal_errors, list) and error_code_ in normal_errors:
-                logger.debug("Retry needed, retryable ServerException caught: %s",
+                logger.debug("Retryable ServerException occurred,ServerException:%s",
                              exception, exc_info=True)
                 return RetryCondition.SHOULD_RETRY
 
             throttling_errors = _find_data_in_retry_config("RetryableThrottlingErrors",
                                                            request,
                                                            self.retry_config)
             if isinstance(throttling_errors, list) and error_code_ in throttling_errors:
-                logger.debug("Retry needed, retryable ThrottlingError caught: %s",
+                logger.debug("Retryable ThrottlingError occurred,ThrottlingError:%s",
                              exception, exc_info=True)
                 return RetryCondition.SHOULD_RETRY | \
                     RetryCondition.SHOULD_RETRY_WITH_THROTTLING_BACKOFF
@@ -119,7 +119,7 @@ def __init__(self, retryable_http_status_list=None):
     def should_retry(self, retry_policy_context):
         if retry_policy_context.http_status_code in self.retryable_http_status_list:
             logger.debug(
-                "Retry needed: retryable HTTP status code received: %s",
+                "Retryable HTTP error occurred,HTTP status code: %s",
                 retry_policy_context.http_status_code)
             return RetryCondition.SHOULD_RETRY
         else: