logstash-input-gelf 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03130364178a5584b79d86fe5c733e7f9cc3c858
-  data.tar.gz: 1f641dfde9e0decddfc65c9cf902e23af80548fa
+  metadata.gz: 52258ea5dad3be0c68d370076faeba0bf29bfe7f
+  data.tar.gz: 904825063dd304497288f92d3a952e4d198a140f
 SHA512:
-  metadata.gz: 0aa0f87a733910dd9d8c5cc5c6461eaa4bf02705e50145b5061f21b669649e4fce428d3ad4e609c9321d7d2272bf1e47e0174b8081e453f50f963cc6dff53b61
-  data.tar.gz: d7e65985b37b75b59b1a28c2ab1c5db04dc3c8cad17a1ed8f2b6e8a0d2c6b58a18c5922387fa3cfecb1cd6e468d2cdd6f0d714604ce2abd98a6291abd663faf1
+  metadata.gz: 4886887976084fa782ce6764ccaf2303e4357d2dc9ac9b1c760b40fd96b5d5de422ab53f672907ad0443ec9b497dcd29e2f3f8faf50c48e09183cc71ac1c0a1d
+  data.tar.gz: 74c8686ea43e97ad1b950c288be5ee255c830851d47e19afab9034187e91a7436f3b5396007aa58b53c912df92578796aa9150d12bb8e1d24d960f1a54747297

data/lib/logstash/inputs/gelf.rb

@@ -46,12 +46,13 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
   def initialize(params)
     super
     BasicSocket.do_not_reverse_lookup = true
+    @shutdown_requested = false
+    @udp = nil
   end # def initialize
 
   public
   def register
     require 'gelfd'
-    @udp = nil
   end # def register
 
   public
@@ -59,13 +60,28 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
     begin
       # udp server
       udp_listener(output_queue)
+    rescue LogStash::ShutdownSignal
+      @shutdown_requested = true
     rescue => e
-      @logger.warn("gelf listener died", :exception => e, :backtrace => e.backtrace)
-      sleep(5)
-      retry
+      unless @shutdown_requested
+        @logger.warn("gelf listener died", :exception => e, :backtrace => e.backtrace)
+        sleep(5)
+        retry
+      end
     end # begin
   end # def run
 
+  public
+  def teardown
+    @shutdown_requested = true
+    if @udp
+      @udp.close_read rescue nil
+      @udp.close_write rescue nil
+      @udp = nil
+    end
+    finished
+  end
+
   private
   def udp_listener(output_queue)
     @logger.info("Starting gelf listener", :address => "#{@host}:#{@port}")
@@ -78,7 +94,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
     @udp = UDPSocket.new(Socket::AF_INET)
     @udp.bind(@host, @port)
 
-    while true
+    while !@shutdown_requested
       line, client = @udp.recvfrom(8192)
       begin
         data = Gelfd::Parser.parse(line)
@@ -91,6 +107,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
       next if data.nil?
 
       event = LogStash::Event.new(LogStash::Json.load(data))
+
       event["source_host"] = client[3]
       if event["timestamp"].is_a?(Numeric)
         event.timestamp = LogStash::Timestamp.at(event["timestamp"])
@@ -99,15 +116,9 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
       remap_gelf(event) if @remap
       strip_leading_underscore(event) if @strip_leading_underscore
       decorate(event)
+
       output_queue << event
     end
-  rescue LogStash::ShutdownSignal
-    # Do nothing, shutdown.
-  ensure
-    if @udp
-      @udp.close_read rescue nil
-      @udp.close_write rescue nil
-    end
   end # def udp_listener
 
   private

data/logstash-input-gelf.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-gelf'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will read GELF messages as events over the network, making it a good choice if you already use Graylog2 today."
   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"

data/spec/inputs/gelf_spec.rb

@@ -1,16 +1,16 @@
-
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/gelf"
 require "gelf"
+
 describe "inputs/gelf" do
-  
 
-  describe "reads chunked gelf messages " do
+  it "reads chunked gelf messages " do
     port = 12209
     host = "127.0.0.1"
     chunksize = 1420
-    gelfclient = GELF::Notifier.new(host,port,chunksize)
+    gelfclient = GELF::Notifier.new(host, port, chunksize)
 
-    config <<-CONFIG
+    conf = <<-CONFIG
       input {
         gelf {
           port => "#{port}"
@@ -19,34 +19,37 @@ describe "inputs/gelf" do
       }
     CONFIG
 
-    input do |pipeline, queue|
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
+    large_random = 2000.times.map{32 + rand(126 - 32)}.join("")
+
+    messages = [
+      "hello",
+      "world",
+      large_random,
+      "we survived gelf!"
+    ]
+
+    events = input(conf) do |pipeline, queue|
+      # send a first message until plugin is up and receives it
+      while queue.size <= 0
+        gelfclient.notify!("short_message" => "prime")
+        sleep(0.1)
+      end
+      gelfclient.notify!("short_message" => "start")
 
-      # generate random characters (message is zipped!) from printable ascii ( SPACE till ~ )
-      # to trigger gelf chunking
-      s = StringIO.new
-      for i in 1..2000
-        s << 32 + rand(126-32)
+      e = queue.pop
+      while (e["message"] != "start")
+        e = queue.pop
       end
-      large_random = s.string
-
-      [ "hello",
-        "world",
-        large_random,
-        "we survived gelf!"
-      ].each do |m|
-  	    gelfclient.notify!( "short_message" => m )
-        # poll at most 10 times
-        waits = 0
-        while waits < 10 and queue.size == 0
-          sleep 0.1
-          waits += 1
-        end
-        insist { queue.size } > 0
-        insist { queue.pop["message"] } == m
+
+      messages.each do |m|
+  	    gelfclient.notify!("short_message" => m)
       end
 
+      messages.map{queue.pop}
+    end
+
+    events.each_with_index do |e, i|
+      insist { e["message"] } == messages[i]
     end
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-gelf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,62 +28,64 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: gelfd
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
-  name: gelfd
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: gelf
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
+        version: 1.3.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
-  name: gelf
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elasticsearch.com
 executables: []
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This input will read GELF messages as events over the network, making it a good choice if you already use Graylog2 today.