embulk-output-elasticsearch 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 660287a649d29f3d92435f6b09f48a5db1a7239c
-  data.tar.gz: 8dcc2256309363657afc86d5b3b3bc2fd1dbaae8
+  metadata.gz: 49c889d135818d8057d7770bd00363f07e6dc2a8
+  data.tar.gz: c0c110dfcfad6ae0a5d1c65bfd14ab36eb2931c8
 SHA512:
-  metadata.gz: 273cbdf5a463a58ac8a4e88bb71b098fe6c08a2365c1b4e98712be703a2875f92401231249817229a9aa0ac22172e3f4e68a1c596a8dd97c509af7890eaa272f
-  data.tar.gz: b7e7188312a602ca1cdca21b5dbb713166ee59bd328273b55f20f0ca707555ac2f0c6d54f9679aa3fe580f1c5b8c9ecbbefed7b455398689814c5cd583729bd0
+  metadata.gz: 43cf761e50854f8322a829c4e646360609e9e15db444bc404ae3137a232ddc4f3dc84704faec733c8edbb9f28826a133e71a11b5450b7e5003aa147d18bf6125
+  data.tar.gz: 464f7ff77c6030ac924fcee2f2856ea0fb3e3c6d842e0706c11a5e912438f10a4eb3aaf6172d9702155d4ca2fdc4cbebf0be4a510eda291d31f70b3b7410c17e

data/.travis.yml

@@ -1,10 +1,7 @@
-dist: precise
 language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
 
 env:
   global:
@@ -25,7 +22,3 @@ before_script:
 script:
   - ./gradlew gem
   - ./gradlew --info check jacocoTestReport
-addons:
-  hosts:
-    - example.com
-  hostname: example.com

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.6 - 2018-08-01
+* [new feature] Add "connect_timeout_millis" option [#53](https://github.com/embulk/embulk-output-elasticsearch/pull/53)
+* [new feature] Only build with Java8 [#52](https://github.com/embulk/embulk-output-elasticsearch/pull/52)
+* [maintenance] Fix bug: "timeout_millis" option doesn't work as expected [#51](https://github.com/muga/embulk-output-elasticsearch/pull/51)
+
 ## 0.4.5 - 2017-11-29
 * [new feature] Add "fill_null_for_empty_column" option and allow insert null value when column is empty [#47](https://github.com/embulk/embulk-output-elasticsearch/pull/47) Thanks! @kfitzgerald
 

data/README.md

@@ -31,7 +31,8 @@ This plugin uses HTTP/REST Client and haven't be implemented AWS authentication.
 - **maximum_retries** Number of maximam retry times (int, optional, default is 7)
 - **initial_retry_interval_millis** Initial interval between retries in milliseconds (int, optional, default is 1000)
 - **maximum_retry_interval_millis** Maximum interval between retries in milliseconds (int, optional, default is 120000)
-- **timeout_millis** timeout in milliseconds for HTTP client(int, optional, default is 60000)
+- **timeout_millis** timeout in milliseconds for each HTTP request(int, optional, default is 60000)
+- **connect_timeout_millis** connection timeout in milliseconds for HTTP client(int, optional, default is 60000)
 - **max_snapshot_waiting_secs** maximam waiting time in second when snapshot is just creating before delete index. works when `mode: replace` (int, optional, default is 1800)
 ### Modes
 

data/build.gradle

@@ -20,11 +20,11 @@ configurations {
 }
 
 group = "org.embulk.output.elasticsearch"
-version = "0.4.5"
+version = "0.4.6"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.36"

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchHttpClient.java

@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 public class ElasticsearchHttpClient
 {
@@ -327,6 +328,7 @@ public class ElasticsearchHttpClient
                             org.eclipse.jetty.client.api.Request request = client
                                     .newRequest(uri)
                                     .accept("application/json")
+                                    .timeout(task.getTimeoutMills(), TimeUnit.MILLISECONDS)
                                     .method(method);
                             if (method == HttpMethod.POST) {
                                 request.content(new StringContentProvider(content), "application/json");
@@ -391,7 +393,7 @@ public class ElasticsearchHttpClient
         }
     }
 
-    private Jetty92RetryHelper createRetryHelper(PluginTask task)
+    private Jetty92RetryHelper createRetryHelper(final PluginTask task)
     {
         return new Jetty92RetryHelper(
                 task.getMaximumRetries(),
@@ -402,6 +404,7 @@ public class ElasticsearchHttpClient
                     public org.eclipse.jetty.client.HttpClient createAndStart()
                     {
                         org.eclipse.jetty.client.HttpClient client = new org.eclipse.jetty.client.HttpClient(new SslContextFactory());
+                        client.setConnectTimeout(task.getConnectTimeoutMills());
                         try {
                             client.start();
                             return client;

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchOutputPluginDelegate.java

@@ -122,6 +122,10 @@ public class ElasticsearchOutputPluginDelegate
         @ConfigDefault("60000")
         int getTimeoutMills();
 
+        @Config("connect_timeout_millis")
+        @ConfigDefault("60000")
+        int getConnectTimeoutMills();
+
         @Config("max_snapshot_waiting_secs")
         @ConfigDefault("1800")
         int getMaxSnapshotWaitingSecs();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -84,13 +84,13 @@ files:
 - src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPluginJSON.java
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_01.json
-- classpath/embulk-base-restclient-0.5.5.jar
-- classpath/embulk-output-elasticsearch-0.4.5.jar
-- classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
-- classpath/jetty-client-9.2.14.v20151106.jar
-- classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/jetty-io-9.2.14.v20151106.jar
 - classpath/jetty-util-9.2.14.v20151106.jar
+- classpath/jetty-http-9.2.14.v20151106.jar
+- classpath/embulk-base-restclient-0.5.5.jar
+- classpath/jetty-client-9.2.14.v20151106.jar
+- classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
+- classpath/embulk-output-elasticsearch-0.4.6.jar
 homepage: https://github.com/embulk/embulk-output-elasticsearch
 licenses:
 - Apache 2.0