logstash-output-elasticsearch_java 2.0.0.beta7 → 2.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfdbbcbfd6ecfbd191d049568d73cb14b1c9f43b
-  data.tar.gz: f43b29863c93fe444b79f240415c2410495c4123
+  metadata.gz: 3cc68f0377369395c84e8c81fa063502036434ba
+  data.tar.gz: f68f93cf3a38cc07ebaedfea32d982752929852f
 SHA512:
-  metadata.gz: c590c373bb9264259b18c50b6760ba6c6646326e8ea234184189374fb21aecd2686219f2301d41858d453ea30aaad14910e8168787354421801e2c8dc8af4d61
-  data.tar.gz: 60ff071251a5a07a934c2530e7e3e331827ddabc61679db65244bd1b7f0b43644a58a128af70a8df89374fcac15332a18e5626c2c2e93d1ea474e89ac70ae849
+  metadata.gz: c9f328eaafb34804e5dbbc2ff4658da8e56f12caa430b62a527cd40012ff759feaa33233618ec059862b38076ddbf9bb2f0c5a9a0e831fc90699be7dba20d477
+  data.tar.gz: c0ddb4d3e5ba928460f98682ff9755d4d20cae11e30e0239862ae47b6ea6be70c8743dd55c61512ce2e23145c2e5feefdbfdc9bc1c827d68a1f48c6bed1e5fda

data/lib/logstash/outputs/elasticsearch_java.rb

@@ -308,42 +308,11 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
       raise LogStash::ConfigurationError, "network_host MUST be set if the 'node' protocol is in use! If this is set incorrectly Logstash will hang attempting to connect!"
     end
 
-    client_settings = {}
-    client_settings["cluster.name"] = @cluster if @cluster
-    client_settings["network.host"] = @network_host if @network_host
-    client_settings["transport.tcp.port"] = @transport_tcp_port if @transport_tcp_port
-    client_settings["client.transport.sniff"] = @sniffing
-
-    if @node_name
-      client_settings["node.name"] = @node_name
-    else
-      client_settings["node.name"] = "logstash-#{Socket.gethostname}-#{$$}-#{object_id}"
-    end
-
-    @@plugins.each do |plugin|
-      name = plugin.name.split('-')[-1]
-      client_settings.merge!(LogStash::Outputs::ElasticSearchJava.const_get(name.capitalize).create_client_config(self))
-    end
-
     if (@hosts.nil? || @hosts.empty?) && @protocol != "node" # node can use zen discovery
       @logger.info("No 'hosts' set in elasticsearch output. Defaulting to localhost")
       @hosts = ["localhost"]
     end
 
-    common_options = {
-      :protocol => @protocol,
-      :client_settings => client_settings,
-      :hosts => @hosts,
-      :port => @port
-    }
-
-    # Update API setup
-    update_options = {
-      :upsert => @upsert,
-      :doc_as_upsert => @doc_as_upsert
-    }
-    common_options.merge! update_options if @action == 'update'
-
     client_class = case @protocol
       when "transport"
         LogStash::Outputs::ElasticSearchJavaPlugins::Protocols::TransportClient
@@ -351,7 +320,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
         LogStash::Outputs::ElasticSearchJavaPlugins::Protocols::NodeClient
     end
 
-    @client = client_class.new(common_options)
+    @client = client_class.new(client_options)
 
     if @manage_template
       begin
@@ -389,6 +358,41 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
     end
   end # def register
 
+  def client_options
+    client_settings = {}
+    client_settings["cluster.name"] = @cluster if @cluster
+    client_settings["network.host"] = @network_host if @network_host
+    client_settings["transport.tcp.port"] = @transport_tcp_port if @transport_tcp_port
+    client_settings["client.transport.sniff"] = @sniffing
+
+    if @node_name
+      client_settings["node.name"] = @node_name
+    else
+      client_settings["node.name"] = "logstash-#{Socket.gethostname}-#{$$}-#{object_id}"
+    end
+
+    @@plugins.each do |plugin|
+      name = plugin.name.split('-')[-1]
+      client_settings.merge!(LogStash::Outputs::ElasticSearchJava.const_get(name.capitalize).create_client_config(self))
+    end
+
+    common_options = {
+      :protocol => @protocol,
+      :client_settings => client_settings,
+      :hosts => @hosts,
+      :port => @port
+    }
+
+    # Update API setup
+    update_options = {
+      :upsert => @upsert,
+      :doc_as_upsert => @doc_as_upsert
+    }
+    common_options.merge! update_options if @action == 'update'
+
+    common_options
+  end
+
 
   public
   def get_template

data/logstash-output-elasticsearch_java.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch_java'
-  s.version         = '2.0.0.beta7'
+  s.version         = '2.0.0.beta8'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch using Java node/transport client"
   s.description     = "Output events to elasticsearch using the java client"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'elasticsearch', ['>= 1.0.13', '~> 1.0']
   s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
   s.add_runtime_dependency 'cabin', ['~> 0.6']
-  s.add_runtime_dependency "logstash-core", ['>= 2.0.0.beta1', '< 3.0.0']
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_development_dependency 'ftw', '~> 0.0.42'
   s.add_development_dependency 'logstash-input-generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_java
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -81,23 +81,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0.snapshot
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0.snapshot
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: