logstash-output-courier 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a42db984950b4a7fe3e1a74ea0808247ac209f5
-  data.tar.gz: b58eb8f7005ce6f4d8b3c59e03e43cfcd298210b
+  metadata.gz: 72e48b750859112062c4c6c76636d444661f30db
+  data.tar.gz: b8b8460f7f0bbd726e571a7a0a5eb46fd0c2ca03
 SHA512:
-  metadata.gz: 8d690bece81b52622ccbbd2e39f4d1241278cb9f2eea2a8d44e2ff66511f85f091ab405c8013359dd88532c0e27cb65cd87dbe4ccae8e324ce11b01f379b6030
-  data.tar.gz: 12da4f0f77ef80d4766b9d6780710f1b94a1d817d002e086f2d65b0455fa645f0b67ad81b4e79c57075f05e38efde45aad0b5997741cc245b565b491e43da764
+  metadata.gz: eb453f9cec327519e8e634c9d9e7f1b526a87067d3b09ba447acb449fe7847ed1404b99fd9e3cc9a57551ee3ce897cd1a8e4d9ff4e164568aa2d36a59dc43e58
+  data.tar.gz: 17c26fd9167b72a12e082db8fc3430f33bc6f1713c8e7d5d8905d429bb9ea64b0a528966ed01bada31fdbd69d17cd4848c9193581f0a2950767ee58116cd80ee

data/lib/logstash/outputs/courier.rb

@@ -17,59 +17,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'logstash/version'
+require 'rubygems/version'
+
 module LogStash
   module Outputs
     # Send events using the Log Courier protocol
     class Courier < LogStash::Outputs::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
+
       # The list of addresses Log Courier should send to
-      config :hosts, :validate => :array, :required => true
+      config :hosts, validate: :array, required: true
 
       # The port to connect to
-      config :port, :validate => :number, :required => true
+      config :port, validate: :number, required: true
 
       # CA certificate for validation of the server
-      config :ssl_ca, :validate => :path, :required => true
+      config :ssl_ca, validate: :path, required: true
 
       # Client SSL certificate to use
-      config :ssl_certificate, :validate => :path
+      config :ssl_certificate, validate: :path
 
       # Client 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
 
       # Maximum number of events to spool before forcing a flush
-      config :spool_size, :validate => :number, :default => 1024
+      config :spool_size, validate: :number, default: 1024
 
       # Maximum time to wait for a full spool before forcing a flush
-      config :idle_timeout, :validate => :number, :default => 5
+      config :idle_timeout, validate: :number, default: 5
 
       public
 
       def register
         @logger.info 'Starting courier output'
 
-        options = {
-          logger:             @logger,
-          addresses:          @hosts,
-          port:               @port,
-          ssl_ca:             @ssl_ca,
-          ssl_certificate:    @ssl_certificate,
-          ssl_key:            @ssl_key,
-          ssl_key_passphrase: @ssl_key_passphrase,
-          spool_size:         @spool_size,
-          idle_timeout:       @idle_timeout,
-        }
-
         require 'log-courier/client'
         @client = LogCourier::Client.new(options)
       end
 
-      public
-
       def receive(event)
         return unless output?(event)
         if event == LogStash::SHUTDOWN
@@ -79,6 +73,21 @@ module LogStash
         end
         @client.publish event.to_hash
       end
+
+      private
+
+      def options
+        result = {}
+
+        [
+          :logger, :addresses, :port, :ssl_ca, :ssl_certificate, :ssl_key,
+          :ssl_key_passphrase, :spool_size, :idle_timeout
+        ].each do |k|
+          result[k] = send(k)
+        end
+
+        result
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-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 Output Logstash Plugin
 email:
 - devel@jasonwoods.me.uk