logstash-input-courier 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795318c287b12e8b141d6b215ec5fb042caf8268
-  data.tar.gz: bfb5fcce3b9b2f2a6642504258731e50c63340cf
+  metadata.gz: 1d4a4f6a90af3abe04151e3b084d89acb90ae8fa
+  data.tar.gz: 2bbd5fd326a947d3c3f7e888472f6d71c61087e2
 SHA512:
-  metadata.gz: 199cad1a65f892858368f9fc82ef18bbf57859dc68478344b397fff9e63019dcf57478538617c41b85777af112e4e4c7ba48e4a30dcc5248fe33e72e0ec64a89
-  data.tar.gz: de2bd683c732365b296222433fd6add83eb2018fdd53b8561633c0c891ce44ee40e2f3340b540749f7dfb8a56397b71a9ebb22ee04efc83f6e717bc2a76bac28
+  metadata.gz: 1e815b3de267267e41133e1ac0272908216bd26d0e87317af23e885b129db66ce4ba9c4986ba6f30e363d4bcb8557b01aec316e1e89a69d21e3796b51cb37d8e
+  data.tar.gz: 0e6497fb44c25c852264076abdb8e8a9e02b1cc998a84c380f45c72f22865bb9dd7cb0cc0e6bf192246ae1f79365e5a84dd362344f73da789e3b6e62e9dfac92

data/lib/logstash/inputs/courier.rb

@@ -31,6 +31,16 @@ module LogStash
         milestone 2
       end
 
+      # Disable raw_events in the Log Courier gem if we're Logstash 1.5.5+ or
+      # 2.0.0+. Due to changes in those versions to JrJackson, JSON outputs like
+      # elasticsearch can be broken by our use of raw_events (which defaults
+      # true). See https://github.com/driskell/log-courier/issues/247
+      if Gem::Version.new(LOGSTASH_VERSION) >= Gem::Version.new('1.5.5')
+        RAW_EVENTS = false
+      else
+        RAW_EVENTS = true
+      end
+
       default :codec, 'plain'
 
       # The IP address to listen on
@@ -107,15 +117,18 @@ module LogStash
         end
       end
 
-      def stop
-        @log_courier.stop
-      end
-
       private
 
       def options
-        result = {}
+        result = {
+          raw_events: RAW_EVENTS
+        }
 
+        add_plugin_options result
+        add_override_options result
+      end
+
+      def add_plugin_options(result)
         [
           :logger, :address, :port, :transport, :ssl_certificate, :ssl_key,
           :ssl_key_passphrase, :ssl_verify, :ssl_verify_default_ca,
@@ -123,8 +136,6 @@ module LogStash
         ].each do |k|
           result[k] = send(k)
         end
-
-        add_override_options result
       end
 
       def add_override_options(result)

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-courier
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Jason Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
+        version: '1.4'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.4'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: log-courier
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.8.3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3
+  prerelease: false
+  type: :runtime
 description: Log Courier Input Logstash Plugin
 email:
 - devel@jasonwoods.me.uk
@@ -52,13 +46,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/logstash/inputs/courier.rb
-homepage: https://github.com/driskell/log-courier
+homepage: https://github.com/driskell/logstash-input-courier
 licenses:
 - Apache
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.4.2
-signing_key: 
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
-summary: Receive events from Log Courier and Logstash using the Log Courier protocol
+summary: Receive events from Log Courier and Logstash using the Courier protocol
 test_files: []