logstash-output-faye 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14c9e20d2204311cdccceec95ded7c923d5e5a7
-  data.tar.gz: a99909df0a849b645c0dcd51c3c8321889e9c5ce
+  metadata.gz: c84a8228af88478051f9d33450c58d8cb331f7a9
+  data.tar.gz: 5321b905941a648b842dcf3267a70a4164f08c15
 SHA512:
-  metadata.gz: 2cbb7b72491bcb996d67dd93c797a8027eabbe4d25ca897885e0e95166bc2885d3d18f4a8d881cb5021162c336a7f2bc790aa347883e7cee5036812c695bd226
-  data.tar.gz: e33ebe3ae1126d536b08554bbbb13bc028742b6e805af38798edd912a68bace4d3c0d0e91c49477e58cc144158eb68e99e959ded9516c8792bd70d6ddeea0f70
+  metadata.gz: a9a960a36ac96bcb68e8bab72d27d91583853a2806114f4508548bc20362e2b3c2ffde554e58fd51e2c1ff4754d3a8f81256a1e2bede631252ceb6f34b641692
+  data.tar.gz: ebd9f5caaf0114f064da65cfc91d40cc6e86ed6dc3368faac1b200aac876c3f5bc43c60fc5818d34115393d55a230d9c8023d9879c36f99624fd4e3bbb47f2ef

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.0
+ - Changed dependency to new logstash-core-plugin-api
+
 ## 2.1.0
  - Option for SSL-verification
 

data/lib/logstash/outputs/faye.rb

@@ -3,6 +3,7 @@
 require "logstash/namespace"
 require "logstash/outputs/base"
 require 'json'
+require 'pry'
 
 # File output.
 #
@@ -29,6 +30,13 @@ class LogStash::Outputs::Faye < LogStash::Outputs::Base
   # especially never in production.
   config :verify_ssl, :validate => :boolean, :default => true
 
+  # This lets you choose the structure and parts of the event that are sent.
+  #
+  # For example:
+  #
+  #    mapping => ["foo", "%{host}", "bar", "%{type}"]
+  config :mapping, :validate => :hash
+
   public
   def register
     require "net/http"
@@ -42,38 +50,52 @@ class LogStash::Outputs::Faye < LogStash::Outputs::Base
   end # def receive
 
   private
-  def _send_message(data)
+  def _send_message(event)
+
+    if @mapping
+        message = Hash.new
+        @mapping.each do |k,v|
+            message[k] = event.sprintf(v)
+        end
+    else
+        message = event.to_hash
+    end
+
     if @faye_token
-      message = {:channel => @channel, :data => data, :ext => {:auth_token => @faye_token}}
+      message = {:channel => @channel, :data => message, :ext => {:auth_token => @faye_token}}
     else
-      message = {:channel => @channel, :data => data}
+      message = {:channel => @channel, :data => message}
     end
 
     uri = URI.parse(@url)
 
-    http = Net::HTTP.new(uri.host, uri.port)
+    begin
+      http = Net::HTTP.new(uri.host, uri.port)
 
-    if uri.scheme == 'https'
-      http.use_ssl = true
+      if uri.scheme == 'https'
+        http.use_ssl = true
 
-      if !@verify_ssl
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      else
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        if !@verify_ssl
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
       end
-    end
 
-    request = Net::HTTP::Post.new(uri.path)
-    request.set_form_data(:message => message.to_json)
+      request = Net::HTTP::Post.new(uri.path)
+      request.set_form_data(:message => message.to_json)
 
-    response = http.request(request)
+      response = http.request(request)
 
-    if response.is_a?(Net::HTTPSuccess)
-      message = JSON.parse(response.body)
+      if response.is_a?(Net::HTTPSuccess)
+        message = JSON.parse(response.body)
 
-      @logger.warn("Faye request was not successfully", message.first) unless message.first['successful']
-    else
-      @logger.warn("Faye response not ok", :http_status => response.code, :message => response.message)
+        @logger.warn("Faye request was not successfully", message.first) unless message.first['successful']
+      else
+        @logger.warn("Faye response not ok", :http_status => response.code, :message => response.message)
+      end
+    rescue Exception => e
+      @logger.warn("Unhandled exception", :request => request, :response => response, :exception => e, :stacktrace => e.backtrace)
     end
 
   end

data/logstash-output-faye.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-faye'
-  s.version         = '2.1.1'
+  s.version         = '2.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send event to faye-message-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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.20", "<= 2.99"
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-faye
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Signify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+        version: '1.20'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+        version: '1.20'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: