Connection timeout default change to 5s

Author: Javen

src/cn/jpush/api/common/IHttpClient.java

@@ -16,10 +16,10 @@ public interface IHttpClient {
     public static final String METHOD_GET = "GET";
 
     //设置连接超时时间
-    public final int DEFAULT_CONNECTION_TIMEOUT = (20 * 1000); // milliseconds
+    public final int DEFAULT_CONNECTION_TIMEOUT = (5 * 1000); // milliseconds
 
     //设置读取超时时间
-    public final int DEFAULT_SOCKET_TIMEOUT = (30 * 1000); // milliseconds
+    public final int DEFAULT_READ_TIMEOUT = (30 * 1000); // milliseconds
 
     public ResponseWrapper sendGet(String url, String params, String authCode);
 

src/cn/jpush/api/common/NativeHttpClient.java

@@ -56,7 +56,7 @@ public ResponseWrapper sendRequest(String url, String content, String method, St
 			URL aUrl = new URL(url);
 			conn = (HttpURLConnection) aUrl.openConnection();
 			conn.setConnectTimeout(DEFAULT_CONNECTION_TIMEOUT);
-			conn.setReadTimeout(DEFAULT_SOCKET_TIMEOUT);
+			conn.setReadTimeout(DEFAULT_READ_TIMEOUT);
 			conn.setUseCaches(false);
 			conn.setRequestMethod(method);
 			conn.setRequestProperty("User-Agent", JPUSH_USER_AGENT);
@@ -135,7 +135,7 @@ public ResponseWrapper sendRequest(String url, String content, String method, St
 
 		} catch (SocketTimeoutException e) {
 		    wrapper.exceptionString = e.getMessage();
-		    LOG.error("Request timeout. Retry later.", e);
+		    LOG.error("Read timeout. Retry later.", e);
 		} catch (ConnectException e) {
 		    wrapper.exceptionString = e.getMessage();
 		    LOG.error("Connnect error. Retry later.", e);
@@ -147,7 +147,7 @@ public ResponseWrapper sendRequest(String url, String content, String method, St
             LOG.error("IO error. Retry later.", e);
 		} catch (Exception e) {
 		    wrapper.exceptionString = e.getMessage();
-		    LOG.error("Unknown exception. ", e);
+		    LOG.error("Unknown exception - Unexpected. Please contact us.", e);
 		} finally {
 			if (null != out) {
 				try {