Merge branch 'master' of https://github.com/aliyun/aliyun-log-produce…

…r-java

README.md

@@ -70,7 +70,7 @@ The comparison of all kinds of access methods
 <dependency>
 	<groupId>com.aliyun.openservices</groupId>
  	<artifactId>aliyun-log</artifactId>
-	<version>0.6.24</version>
+	<version>0.6.27</version>
 </dependency>
 <dependency>
 	<groupId>com.aliyun.openservices</groupId>
@@ -96,8 +96,6 @@ public class ProducerConfig {
     // The backend thread will merge the data being sent to the same shard together, and shard is associated with a hash interval.
     // The producer will pull the hash interval information for each shard from AliCloud Log Service regularly and update the local value, this parameter stands for the time interval.
     public int shardHashUpdateIntervalInMS = 10 * 60 * 1000;
-    // Specify the retry times when failing to send data, if exceeds this value, the exception will be used as a parameter for the callback, default is 3
-    public int retryTimes = 3;
     // protobuf
     public String logsFormat = "protobuf";
     // Specify the I/O thread pool's maximum pool size, the main function of the I/O thread pool is to send data, default is 8
@@ -152,11 +150,6 @@ The main function of callback is to handle the results of sending data. The resu
 <td>If shardHash is specified when you send data, you should care about this parameter, otherwise there is no need to care about it. The backend thread will merge the data being sent to the same shard together, and shard is associated with a hash interval. The producer will pull the hash interval information for each shard from AliCloud Log Service regularly and update the local value, this parameter stands for the time interval.</td>
 <td>Integer, in milliseconds</td>
 </tr>
-<tr>
-<td>retryTimes</td>
-<td>Specify the retry times when failing to send data, if exceeds this value, the exception will be used as a parameter for the callback.</td>
-<td>Integer, default is 3</td>
-</tr>
 </tbody>
 </table>
 

README_CN.md

@@ -75,7 +75,7 @@ Aliyun LOG Java Producer 配置分为以下几个步骤：
 <dependency>
 	<groupId>com.aliyun.openservices</groupId>
  	<artifactId>aliyun-log</artifactId>
-	<version>0.6.24</version>
+	<version>0.6.27</version>
 </dependency>
 <dependency>
 	<groupId>com.aliyun.openservices</groupId>
@@ -102,8 +102,6 @@ public class ProducerConfig {
     //producer在处理时会将用户传入的hash映射成shard关联hash区间的最小值。每一个shard关联的hash区间，producer会定时从loghub拉取，该参数的含义是每隔shardHashUpdateIntervalInMS毫秒，
     //更新一次shard的hash区间。
     public int shardHashUpdateIntervalInMS = 10 * 60 * 1000;
-    //如果发送失败，重试的次数，如果超过该值，就会将异常作为callback的参数，交由用户处理。
-    public int retryTimes = 3;
     //protobuf
     public String logsFormat = "protobuf";
     //IO线程池最大线程数量
@@ -158,11 +156,6 @@ public class ProducerConfig {
 <td>指定更新Shard的Hash区间的时间间隔，当指定shardhash的方式发送日志时，需要设置此参数。<br>后端merge线程会将映射到同一个Shard的数据merge在一起，而Shard关联的是一个Hash区间，Producer在处理时会将用户传入的Hash映射成Shard关联Hash区间的最小值。每一个Shard关联的Hash区间，Producer会定时从LogHub拉取。</td>
 <td>整数形式。</td>
 </tr>
-<tr>
-<td>retryTimes</td>
-<td>指定发送失败时重试的次数，如果超过该值，就会将异常作为callback的参数，交由用户处理。</td>
-<td>整数形式。</td>
-</tr>
 </tbody>
 </table>