logstash-input-varnishncsa 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a2d4441ca61888ccbfa26982d8012a7a11de38
-  data.tar.gz: 66fbb34c63090386a582d76327d6ce5230f6e28c
+  metadata.gz: 29b000ebfd65182bdb1cea288aa8ffd26fe4e553
+  data.tar.gz: 1d6f137b024ba3e18442c02061cb31c25f2e7037
 SHA512:
-  metadata.gz: ac7792a0a0fec07147f6475ec82f67ee4c386abfb280a2d033e95b8824e63ddb8844ea8ceaf0146d375f116fd5acb75df0bab731af06f48f6a25859de2f09b93
-  data.tar.gz: d4790aab5a747d043194b53637c0fb744ea019f3854de7ce2475ba5d08d57bf917138cac5b8dcda561e1033c1f6dbf20fc3664f2365f6e687bc2bdac41e2c016
+  metadata.gz: 5c9f08277f1fd300d3b7e9e3ca1f0244f35ef750a3fdb5ba574a1b912c5b994c61fb585b62df09af1cd4a0c3f75b18cfd9c0af25c765f179a1b023449fa789e7
+  data.tar.gz: ba3422b26b598c29f9f880d4bbea76be51fc8dbd31b27aa6d020159a51afccd56ec4408751bd9e9830fbb092b00bedbbdc8a1d4489d370deb0c124aa0078b112

data/lib/logstash/inputs/varnishncsa.rb

@@ -10,8 +10,6 @@ class LogStash::Inputs::Varnishncsa < LogStash::Inputs::Threadable
 
   config :instance, :validate => :string, :default => "default"
 
-  trap("SIGINT") { @@reopen = 1}
-
   Logline = Struct.new(
     :df_H,     # %H, Protocol version
     :df_U,     # %U, URL path
@@ -54,10 +52,11 @@ class LogStash::Inputs::Varnishncsa < LogStash::Inputs::Threadable
   end # def register
 
   def run(queue)
-    @q = queue
-    @hostname = Socket.gethostname
-    # callback = Proc.new { |*args| h_ncsa(*args) }
-    Varnish::VSL.VSL_Dispatch(@vd, self.method(:h_ncsa).to_proc, FFI::MemoryPointer.new(:pointer))
+    while !stop? do
+      @q = queue
+      @hostname = Socket.gethostname
+      Varnish::VSL.VSL_Dispatch(@vd, self.method(:h_ncsa).to_proc, FFI::MemoryPointer.new(:pointer))
+    end
   end # def run
 
   private
@@ -263,8 +262,10 @@ class LogStash::Inputs::Varnishncsa < LogStash::Inputs::Threadable
     begin
       str = ptr.read_string(len)
       if spec == :spec_client
+        @logger.debug('Collect client')
         collect_client(tag, str)
       elsif spec == :spec_backend
+        @logger.debug('collect backend')
         collect_backend(tag, str)
       else
         return @@reopen

data/logstash-input-varnishncsa.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-varnishncsa'
-  s.version         = '2.0.4'
+  s.version         = '2.0.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read from varnish cache's shared memory log and return all value in a logstash field (rewrite of varnishlog in ruby)"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-varnishncsa
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - hans moulron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core