Merge pull request #183 from tencentyun/dev/presigned_url_encode

log coding

Author: Dzkol

src/main/java/com/qcloud/cos/exception/ExceptionLogDetail.java

@@ -1,34 +1,20 @@
 package com.qcloud.cos.exception;
 
 public class ExceptionLogDetail {
-    public ExceptionLogDetail(Throwable t, String exception_level, long time_stamp, int execute_index) {
+    public ExceptionLogDetail(Throwable t, String msg) {
         this.t = t;
-        this.exception_level = exception_level;
-        this.time_stamp = time_stamp;
-        this.execute_index = execute_index;
-    }
-
-    public long getTimeStamp() {
-        return time_stamp;
-    }
-
-    public String getExceptionLevel() {
-        return exception_level;
+        this.err_msg = msg;
     }
 
     public Throwable getException() {
         return t;
     }
 
-    public int getExecuteIndex() {
-        return execute_index;
+    public String getErrMsg() {
+        return err_msg;
     }
 
-    private long time_stamp;
-
     private Throwable t;
 
-    private String exception_level;
-
-    private int execute_index;
+    private String err_msg;
 }

src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java

@@ -512,17 +512,23 @@ public <X, Y extends CosServiceRequest> X exeute(CosHttpRequest<Y> request,
                 break;
             } catch (CosServiceException cse) {
                 closeHttpResponseStream(httpResponse);
-                request.addLogDetails(new ExceptionLogDetail(cse, "service", System.currentTimeMillis(), retryIndex));
+                String errorMsg = String.format("failed to execute http request due to service exception, request timeStamp %d,"
+                                + " httpRequest: %s, retryIdx:%d, maxErrorRetry:%d", System.currentTimeMillis(), request,
+                        retryIndex, maxErrorRetry);
+                request.addLogDetails(new ExceptionLogDetail(cse, errorMsg));
                 if (!shouldRetry(request, httpResponse, cse, retryIndex, retryPolicy)) {
-                    if (cse.getStatusCode() >= 500) {
+                    if (cse.getStatusCode() >= 400) {
                         handleLog(request);
                     }
                     throw cse;
                 }
                 changeEndpointForRetry(request, httpResponse, retryIndex);
             } catch (CosClientException cce) {
                 closeHttpResponseStream(httpResponse);
-                request.addLogDetails(new ExceptionLogDetail(cce, "client", System.currentTimeMillis(), retryIndex));
+                String errorMsg = String.format("failed to execute http request due to client exception, request timeStamp %d,"
+                                + " httpRequest: %s, retryIdx:%d, maxErrorRetry:%d", System.currentTimeMillis(), request,
+                        retryIndex, maxErrorRetry);
+                request.addLogDetails(new ExceptionLogDetail(cce, errorMsg));
                 if (!shouldRetry(request, httpResponse, cce, retryIndex, retryPolicy)) {
                     handleLog(request);
                     throw cce;
@@ -631,10 +637,7 @@ private HttpResponse executeRequest(HttpContext context, HttpRequestBase httpReq
 
     private <Y extends CosServiceRequest> void handleLog(CosHttpRequest<Y> request) {
         for (ExceptionLogDetail logDetail : request.getExceptionsLogDetails()) {
-            String errorMsg = String.format("failed to execute http request due to %s exception, request timeStamp %d,"
-                            + " httpRequest: %s, retryIdx:%d, maxErrorRetry:%d", logDetail.getExceptionLevel(), logDetail.getTimeStamp(), request,
-                    logDetail.getExecuteIndex(), maxErrorRetry);
-            log.error(errorMsg, logDetail.getException());
+            log.error(logDetail.getErrMsg(), logDetail.getException());
         }
     }