logstash-input-stomp 0.1.4 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b357c1b0dff89d5ce2eb3e4580b40924dda7ef
-  data.tar.gz: 7b0148e1dcc945ab4fe89a3856b46e1443652586
+  metadata.gz: 80605f7108b894b050ba277624e41b03f2bd3826
+  data.tar.gz: 0fe3f542744774573c583e0463256147aef136f9
 SHA512:
-  metadata.gz: af1e0460ca5831ccf7a1a191890b8c19a22a3b761d5bdfd101461cfcee73fe8fe4cbdb76f0e8c6153659ba8c77f5c7461b95fee1c3fbe06b608a36a745fc08e2
-  data.tar.gz: 4f1b541ee48b380604b41d37f62267a39ba8e84c2924116688f77cfe0d2f642c4abfa35c3145139e0c962013c6d9aa685807770120cbd9aaeae0fc2138e1f058
+  metadata.gz: 274b5513205452f5da29daf1c3ef87ac970802fca20b5fdb5924f1279a77c20801e3148547d5230573d5e634033b5414c378a654bb3b11009842ffc4b2242a3c
+  data.tar.gz: cfa592e611861617de36c27fa01f04ab22b2bb85430519cfad67c8213f9e496cc7ac4445b8bb38d163141dcdee8e7a0bb8922285b44c3c1b968b5903fdd13bb0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/stomp.rb

@@ -3,8 +3,9 @@ require "logstash/inputs/base"
 require "logstash/namespace"
 require 'pp'
 
-
 class LogStash::Inputs::Stomp < LogStash::Inputs::Base
+  attr_accessor :client
+
   config_name "stomp"
 
   default :codec, "plain"
@@ -35,33 +36,39 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
   private
   def connect
     begin
-      @client.connect
-      @logger.debug("Connected to stomp server") if @client.connected?
+      client.connect
+      @logger.debug("Connected to stomp server") if client.connected?
     rescue => e
       @logger.debug("Failed to connect to stomp server, will retry", :exception => e, :backtrace => e.backtrace)
-      sleep 2
-      retry
+      if stop?
+        sleep 2
+        retry
+      end
     end
   end
 
   public
   def register
     require "onstomp"
-    @client = OnStomp::Client.new("stomp://#{@host}:#{@port}", :login => @user, :passcode => @password.value)
-    @client.host = @vhost if @vhost
+    client = new_client
+    client.host = @vhost if @vhost
     @stomp_url = "stomp://#{@user}:#{@password}@#{@host}:#{@port}/#{@destination}"
 
     # Handle disconnects 
-    @client.on_connection_closed {
+    client.on_connection_closed {
       connect
       subscription_handler # is required for re-subscribing to the destination
     }
     connect
   end # def register
 
+  def new_client
+    OnStomp::Client.new("stomp://#{@host}:#{@port}", :login => @user, :passcode => @password.value)
+  end
+
   private
   def subscription_handler
-    @client.subscribe(@destination) do |msg|
+    client.subscribe(@destination) do |msg|
       @codec.decode(msg.body) do |event|
         decorate(event)
         @output_queue << event
@@ -72,8 +79,10 @@ class LogStash::Inputs::Stomp < LogStash::Inputs::Base
     #the flow control to the 'run' method below. After that, the
     #method "run_input" from agent.rb marks 'done' as 'true' and calls
     #'finish' over the Stomp plugin instance.
-    #'Sleeping' the plugin leves the instance alive.
-    sleep
+    #'Sleeping' the plugin leaves the instance alive.
+    until stop?
+      sleep 1
+    end
   end
 
   public

data/logstash-input-stomp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-stomp'
-  s.version         = '0.1.4'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from a stomp server"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'onstomp'

data/spec/inputs/stomp_spec.rb

@@ -1 +1,15 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/stomp"
+
+describe LogStash::Inputs::Stomp do
+  describe "stopping" do
+    let(:config) { {"host" => "localhost", "destination" => "/foo"} }
+    let(:client) { double("client") }
+    before do
+      subject.client = client
+      allow(subject).to receive(:connect)
+      allow(client).to receive(:subscribe)
+    end
+    it_behaves_like "an interruptible input plugin"
+  end
+end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-stomp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -26,10 +26,10 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -78,12 +78,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/stomp.rb
 - logstash-input-stomp.gemspec
 - spec/inputs/stomp_spec.rb
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Pull events from a stomp server

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"