error message more friendly

tencentyun · Dec 25, 2018 · 7e85fbf · 7e85fbf
1 parent 1f24881
commit 7e85fbf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/dep/cos_migrate_tool-1.0-jar-with-dependencies.jar b/dep/cos_migrate_tool-1.0-jar-with-dependencies.jar
diff --git a/src/main/java/com/qcloud/cos_migrate_tool/task/TaskExecutor.java b/src/main/java/com/qcloud/cos_migrate_tool/task/TaskExecutor.java
@@ -58,7 +58,7 @@ public TaskExecutor(MigrateType migrateType, CommonConfig config) {
         if (config.getEndpointSuffix() != null) {
             clientConfig.setEndPointSuffix(config.getEndpointSuffix());
         }
-        clientConfig.setUserAgent("cos-migrate-tool-v1.0");
+        clientConfig.setUserAgent("cos-migrate-tool-v1.2.5");
 
         if (!config.getProxyHost().isEmpty() && config.getProxyPort() > 0) {
             clientConfig.setHttpProxyIp(config.getProxyHost());

diff --git a/src/main/java/com/qcloud/cos_migrate_tool/utils/Downloader.java b/src/main/java/com/qcloud/cos_migrate_tool/utils/Downloader.java
@@ -54,7 +54,7 @@ private Downloader() {
         this.idleConnectionMonitor.start();
     }
 
-    public HeadAttr headFile(String url, boolean qiniuDownLoadFlag) {
+    public HeadAttr headFile(String url, boolean qiniuDownLoadFlag) throws Exception {
 
         int retry = 0;
         int maxRetryCount = 5;
@@ -95,8 +95,16 @@ public HeadAttr headFile(String url, boolean qiniuDownLoadFlag) {
             httpHead.setHeader("Connection", "Keep-Alive");
             httpHead.setHeader("User-Agent", "cos-migrate-tool");
 
+            HttpResponse httpResponse = null;
             try {
-                HttpResponse httpResponse = httpClient.execute(httpHead);
+                 httpResponse = httpClient.execute(httpHead);
+            } catch (Exception e) {
+                log.error("head file attr fail, url: {}, retry: {}/{}, exception: {}", url, retry,
+                        maxRetryCount, e.toString());
+                httpHead.abort();
+                ++retry;
+            }
+
                 int http_statuscode = httpResponse.getStatusLine().getStatusCode();
                 if (http_statuscode < 200 || http_statuscode > 299) {
                     String errMsg = String.format(
@@ -146,14 +154,9 @@ public HeadAttr headFile(String url, boolean qiniuDownLoadFlag) {
                 }
 
                 return headAttr;
-            } catch (Exception e) {
-                log.error("head file attr fail, url: {}, retry: {}/{}, exception: {}", url, retry,
-                        maxRetryCount, e.toString());
-                httpHead.abort();
-                ++retry;
-            }
         }
         return null;
+
     }
 
     private void showDownloadProgress(String url, long byteTotal, long byteDownloadSofar) {