logstash-input-courier 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33ca55f8e8c0c491e6f9a50d87511cc94b83d72
-  data.tar.gz: 7c3d5aada21209f39fa1e6697ae0a7f8b50260f6
+  metadata.gz: 7981989158bbbf5c236b66a14ccd472e78614599
+  data.tar.gz: fe9f9f20dca027e2f7c4bb585941e7d7136b8adc
 SHA512:
-  metadata.gz: 52579976950b1e45e68963fea9b89577b408c35b18b3065567ca7d0bb521aad4b77266a92ec2e4f7d716fe6e789971261688c303706348c7cf6105fba10b2ede
-  data.tar.gz: c1f51ed9e99f0bdfe1fab6f38e375968409b2b7dda080982615c33f87a1e0c79137de98e838dbefa4afee7eff9c4b0a65fdfc2b0b60e6295a4e773f3b8e62e77
+  metadata.gz: 23121ed9af2f33fd88809f076642e89e98240aff9283324e2a8e923ab805ca1627d0ca958a578b38b2c19c71038ad13568b25cdc2df282cc18b0f898b2a3f6db
+  data.tar.gz: 65d71d81c6cf395bfb1db87ccef473f636eb4ed2ae8a8b8f6b2f2bd21afd512f4738ece50445030bffeb889f5af6c7cc43800b1e639c205c13dde232a284ea2d

data/lib/logstash/inputs/courier.rb

@@ -17,46 +17,55 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'logstash/version'
+require 'rubygems/version'
+
 module LogStash
   module Inputs
     # Receive events over the Log Courier protocol
     class Courier < LogStash::Inputs::Base
       config_name 'courier'
 
+      # Compatibility with Logstash 1.4 requires milestone
+      if Gem::Version.new(LOGSTASH_VERSION) < Gem::Version.new('1.5.0')
+        milestone 2
+      end
+
       default :codec, 'plain'
 
       # The IP address to listen on
-      config :host, :validate => :string, :default => '0.0.0.0'
+      config :host, validate: :string, default: '0.0.0.0'
 
       # The port to listen on
-      config :port, :validate => :number, :required => true
+      config :port, validate: :number, required: true
 
       # The transport type to use
-      config :transport, :validate => :string, :default => 'tls'
+      config :transport, validate: :string, default: 'tls'
 
       # SSL certificate to use
-      config :ssl_certificate, :validate => :path
+      config :ssl_certificate, validate: :path
 
       # SSL key to use
-      config :ssl_key, :validate => :path
+      config :ssl_key, validate: :path
 
       # SSL key passphrase to use
-      config :ssl_key_passphrase, :validate => :password
+      config :ssl_key_passphrase, validate: :password
 
       # Whether or not to verify client certificates
-      config :ssl_verify, :validate => :boolean, :default => false
+      config :ssl_verify, validate: :boolean, default: false
 
-      # When verifying client certificates, also trust those signed by the system's default CA bundle
-      config :ssl_verify_default_ca, :validate => :boolean, :default => false
+      # When verifying client certificates, also trust those signed by the
+      # system's default CA bundle
+      config :ssl_verify_default_ca, validate: :boolean, default: false
 
       # CA certificate to use when verifying client certificates
-      config :ssl_verify_ca, :validate => :path
+      config :ssl_verify_ca, validate: :path
 
       # Curve secret key
-      config :curve_secret_key, :validate => :string
+      config :curve_secret_key, validate: :string
 
       # Max packet size
-      config :max_packet_size, :validate => :number
+      config :max_packet_size, validate: :number
 
       # The size of the internal queue for each peer
       #
@@ -64,7 +73,7 @@ module LogStash
       #
       # This setting should max the max_pending_payloads Log Courier
       # configuration
-      config :peer_recv_queue, :validate => :number
+      config :peer_recv_queue, validate: :number
 
       # Add additional fields to events that identity the peer
       #
@@ -73,46 +82,59 @@ module LogStash
       # "peer" identifies the source host and port
       # "peer_ssl_cn" contains the client certificate hostname for TLS peers
       # using client certificates
-      config :add_peer_fields, :validate => :boolean
+      config :add_peer_fields, validate: :boolean
 
       public
 
       def register
-        @logger.info 'Starting courier input listener', :address => "#{@host}:#{@port}"
-
-        options = {
-          logger:                @logger,
-          address:               @host,
-          port:                  @port,
-          transport:             @transport,
-          ssl_certificate:       @ssl_certificate,
-          ssl_key:               @ssl_key,
-          ssl_key_passphrase:    @ssl_key_passphrase,
-          ssl_verify:            @ssl_verify,
-          ssl_verify_default_ca: @ssl_verify_default_ca,
-          ssl_verify_ca:         @ssl_verify_ca,
-          curve_secret_key:      @curve_secret_key,
-        }
-
-        # Honour the defaults in the LogCourier gem
-        options[:max_packet_size] = @max_packet_size unless @max_packet_size.nil?
-        options[:peer_recv_queue] = @peer_recv_queue unless @peer_recv_queue.nil?
-        options[:add_peer_fields] = @add_peer_fields unless @add_peer_fields.nil?
+        @logger.info(
+          'Starting courier input listener',
+          address: "#{@host}:#{@port}"
+        )
 
         require 'log-courier/server'
         @log_courier = LogCourier::Server.new options
       end
 
-      public
-
       def run(output_queue)
         @log_courier.run do |event|
-          event['tags'] = [event['tags']] if event.has_key?('tags') && !event['tags'].is_a?(Array)
+          if event.key?('tags') && !event['tags'].is_a?(Array)
+            event['tags'] = [event['tags']]
+          end
           event = LogStash::Event.new(event)
           decorate event
           output_queue << event
         end
       end
+
+      private
+
+      def options
+        result = {}
+
+        [
+          :logger, :address, :port, :transport, :ssl_certificate, :ssl_key,
+          :ssl_key_passphrase, :ssl_verify, :ssl_verify_default_ca,
+          :curve_secret_key
+        ].each do |k|
+          result[k] = send(k)
+        end
+
+        add_override_options result
+      end
+
+      def add_override_options(result)
+        # Honour the defaults in the LogCourier gem
+        [:max_packet_size, :peer_recv_queue, :add_peer_fields].each do |k|
+          result[k] = send(k) unless send(k).nil?
+        end
+        result
+      end
+
+      def address
+        # TODO: Fix this naming inconsistency
+        @host
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-courier
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - Jason Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 description: Log Courier Input Logstash Plugin
 email:
 - devel@jasonwoods.me.uk