fluent-plugin-amqp 0.6.1 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTIzYmM5YWJjYjNmY2IyZGRkOWM4NDg0NTUwOGE2ZTQ2OWFjYzdjNQ==
-  data.tar.gz: !binary |-
-    YjU4Y2E5ZDVmMDdlZmU5MmJjYjczNzgxNjFjOTc0ZGE0NGE2YzM5OA==
+SHA1:
+  metadata.gz: ac0659509393a3cbe0f5a86a2925e8227e705f23
+  data.tar.gz: 86ab5e6981907aceec58b4a76abab2b1a483341d
 SHA512:
-  metadata.gz: !binary |-
-    YmM5N2E2NDUyZTg5MzdkNDc0MmEwNTdiNGViYTUyZDQ1NDA1MTZiMGFkOWQ2
-    ZGIzYWZlNTIyZDg5YTNlYTU2ZmUzNmMzMjk4OWE3ZTY5OTZiMDNhNDg4YWFm
-    ODRiMTEzMmM3YWE0Yjg1ZWRjNmMwNjg5NzM1OWIxMDRlMmRhMDE=
-  data.tar.gz: !binary |-
-    OTdlMDgzMzM3MjAyYmYyYmQzNzVmZDgyMzgwNzc4MDdkYjkwYzViOTQ1YTdm
-    Yzg2OTMwZGU4MzZmM2IwMWRhMzI4MTFhY2ZlMjFjYTZiMTZlYjg3ZjMzMWJk
-    MTA5N2VmYWEwMzI3NGVjYTRiYjJhMTcwZTkwMTVlMGY5M2UyNTA=
+  metadata.gz: 3843d792b1904cffe3846ba20a73838774ab32e9a76254317d728aeb06277bea205fcd530b05d61ba9c620880ab8405d856fc2f15ea40b2a611361cc32025c17
+  data.tar.gz: da272abdad7b8ed575cf617c55cc5076e9d52edc2602385461dee42eedeb275ccde7a037b376b204b48af41eb1ba00db82cc97d3a61b149139770c33e71daea4

data/lib/fluent/plugin/in_amqp.rb

@@ -9,6 +9,10 @@ module Fluent
       define_method("router") { Engine }
     end
 
+    # Bunny connection handle
+    #   - Allows mocking for test purposes
+    attr_accessor :connection
+
     config_param :tag, :string, :default => "hunter.amqp"
 
     config_param :host, :string, :default => nil
@@ -28,12 +32,18 @@ module Fluent
     config_param :tag_key, :bool, :default => false
     config_param :tag_header, :string, :default => nil
     config_param :time_header, :string, :default => nil
+    config_param :tls, :bool, :default => false
+    config_param :tls_cert, :string, :default => nil
+    config_param :tls_key, :string, :default => nil
+    config_param :tls_ca_certificates, :array, :default => nil
+    config_param :tls_verify_peer, :bool, :default => true
 
     def initialize
       require 'bunny'
       super
     end
 
+
     def configure(conf)
       conf['format'] ||= conf['payload_format'] # legacy
 
@@ -48,9 +58,8 @@ module Fluent
       unless @host && @queue
         raise ConfigError, "'host' and 'queue' must be all specified."
       end
-      @bunny = Bunny.new(:host => @host, :port => @port, :vhost => @vhost,
-                         :pass => @pass, :user => @user, :ssl => @ssl,
-                         :verify_ssl => @verify_ssl, :heartbeat => @heartbeat)
+      check_tls_configuration
+
     end
 
     def start
@@ -59,14 +68,16 @@ module Fluent
     end
 
     def shutdown
-      @bunny.stop
+      @connection.stop
       @thread.join
       super
     end
 
     def run
-      @bunny.start
-      @channel = @bunny.create_channel
+      # Create a new connection, unless its already been provided to us
+      @connection = Bunny.new get_connection_options unless @connection
+      @connection.start
+      @channel = @connection.create_channel
       q = @channel.queue(@queue, :passive => @passive, :durable => @durable,
                        :exclusive => @exclusive, :auto_delete => @auto_delete)
       q.subscribe do |delivery, meta, msg|
@@ -110,6 +121,29 @@ module Fluent
         Time.new.to_i
       end
     end
+
+    def check_tls_configuration()
+      if @tls
+        unless @tls_key && @tls_cert
+            raise ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
+        end
+      end
+    end
+
+    def get_connection_options()
+      opts = {
+        :host => @host, :port => @port, :vhost => @vhost,
+        :pass => @pass, :user => @user, :ssl => @ssl,
+        :verify_ssl => @verify_ssl, :heartbeat => @heartbeat,
+        :tls                 => @tls,
+        :tls_cert            => @tls_cert,
+        :tls_key             => @tls_key,
+        :verify_peer         => @tls_verify_peer
+      }
+      opts[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
+      return opts
+    end
+
   end # class AMQPInput
 
 end # module Fluent

data/lib/fluent/plugin/out_amqp.rb

@@ -3,6 +3,8 @@ module Fluent
   class AMQPOutput < BufferedOutput
     Plugin.register_output("amqp", self)
 
+    attr_accessor :connection
+
     config_param :host, :string, :default => nil
     config_param :user, :string, :default => "guest"
     config_param :pass, :string, :default => "guest", :secret => true
@@ -21,6 +23,11 @@ module Fluent
     config_param :tag_key, :bool, :default => false
     config_param :tag_header, :string, :default => nil
     config_param :time_header, :string, :default => nil
+    config_param :tls, :bool, :default => false
+    config_param :tls_cert, :string, :default => nil
+    config_param :tls_key, :string, :default => nil
+    config_param :tls_ca_certificates, :array, :default => nil
+    config_param :tls_verify_peer, :bool, :default => true
 
     def initialize
       super
@@ -30,21 +37,21 @@ module Fluent
     def configure(conf)
       super
       @conf = conf
-      unless @host && @exchange
-        raise ConfigError, "'host' and 'exchange' must be all specified."
+      unless @host
+        raise ConfigError, "'host' must be specified."
       end
       unless @key || @tag_key
         raise ConfigError, "Either 'key' or 'tag_key' must be set."
       end
-      @bunny = Bunny.new(:host => @host, :port => @port, :vhost => @vhost,
-                         :pass => @pass, :user => @user, :ssl => @ssl, :verify_ssl => @verify_ssl,
-                         :heartbeat => @heartbeat)
+      check_tls_configuration
     end
 
     def start
       super
-      @bunny.start
-      @channel = @bunny.create_channel
+      @connection = Bunny.new(get_connection_options) unless @connection
+
+      @connection.start
+      @channel = @connection.create_channel
       @exch = @channel.exchange(@exchange, :type => @exchange_type.intern,
                               :passive => @passive, :durable => @durable,
                               :auto_delete => @auto_delete)
@@ -52,7 +59,7 @@ module Fluent
 
     def shutdown
       super
-      @bunny.stop
+      @connection.stop
     end
 
     def format(tag, time, record)
@@ -81,5 +88,29 @@ module Fluent
       end
     end
 
+
+    private
+    def check_tls_configuration()
+      if @tls
+        unless @tls_key && @tls_cert
+            raise ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
+        end
+      end
+    end
+
+    def get_connection_options()
+      opts = {
+        :host => @host, :port => @port, :vhost => @vhost,
+        :pass => @pass, :user => @user, :ssl => @ssl,
+        :verify_ssl => @verify_ssl, :heartbeat => @heartbeat,
+        :tls                 => @tls,
+        :tls_cert            => @tls_cert,
+        :tls_key             => @tls_key,
+        :verify_peer         => @tls_verify_peer
+      }
+      opts[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
+      return opts
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Hiromi Ishii
@@ -16,86 +16,114 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: bunny-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: AMQP input/output plugin for fluentd
 email: sawanoboriyu@higanworks.com
 executables: []
@@ -116,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AMQP input/output plugin or fluentd