fluent-plugin-amqp 0.9.3 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b4afb9f6144c0448aefb570fbe50d47f8ad4845c
+  data.tar.gz: 9c07383eb91e5e825d12fb23a93b294245afb9c8
+SHA512:
+  metadata.gz: dc9872fd8d8fef5e4f38bebacbf440a7b6b89568f4285592d09190d4ecdf40ec32f9f94606f6f273a7e6ca1b2737d53d0aafc237a9b5002c62f41da07e006ab7
+  data.tar.gz: 972dcc4296cc3e0c87245fde0763336a39e8e436237ec3f7930516e68ca0db9c13aa7e19714ef19549d8770192c595960737c242a0c13da38b759effcbd8d48c

data/lib/fluent/plugin/in_amqp.rb

@@ -1,73 +1,64 @@
 require 'time'
-require 'fluent/input'
-require 'fluent/parser'
+require 'fluent/plugin/input'
+require 'fluent/plugin/parser'
+require 'bunny'
 
-module Fluent
+module Fluent::Plugin
   ##
   # AMQPInput to be used as a Fluent SOURCE, reading messages from a RabbitMQ
   # message broker
   class AMQPInput < Input
     Fluent::Plugin.register_input('amqp', self)
 
-    # Define `router` method of v0.12 to support v0.10.57 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Engine }
-    end
+    helpers :compat_parameters, :parser
 
     # Bunny connection handle
     #   - Allows mocking for test purposes
     attr_accessor :connection
 
-    config_param :tag, :string, :default => "hunter.amqp"
-
-    config_param :host, :string, :default => nil
-    config_param :hosts, :array, :default => nil
-    config_param :user, :string, :default => "guest"
-    config_param :pass, :string, :default => "guest", :secret => true
-    config_param :vhost, :string, :default => "/"
-    config_param :port, :integer, :default => 5672
-    config_param :ssl, :bool, :default => false
-    config_param :verify_ssl, :bool, :default => false
-    config_param :heartbeat, :integer, :default => 60
-    config_param :queue, :string, :default => nil
-    config_param :durable, :bool, :default => false
-    config_param :exclusive, :bool, :default => false
-    config_param :auto_delete, :bool, :default => false
-    config_param :passive, :bool, :default => false
-    config_param :payload_format, :string, :default => "json"
-    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
-    config_param :bind_exchange, :bool, :default => false
-    config_param :exchange, :string, :default => ""
-    config_param :routing_key, :string, :default => "#"                       # The routing key used to bind queue to exchange - # = matches all, * matches section (tag.*.info)
-
-
-
-    def initialize
-      require 'bunny'
-      super
-    end
-
+    config_param :tag, :string, default: "hunter.amqp"
+
+    config_param :host, :string, default: nil
+    config_param :hosts, :array, default: nil
+    config_param :user, :string, default: "guest"
+    config_param :pass, :string, default: "guest", secret: true
+    config_param :vhost, :string, default: "/"
+    config_param :port, :integer, default: 5672
+    config_param :ssl, :bool, default: false
+    config_param :verify_ssl, :bool, default: false
+    config_param :heartbeat, :integer, default: 60
+    config_param :queue, :string, default: nil
+    config_param :durable, :bool, default: false
+    config_param :exclusive, :bool, default: false
+    config_param :auto_delete, :bool, default: false
+    config_param :passive, :bool, default: false
+    config_param :payload_format, :string, default: "json"
+    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
+    config_param :bind_exchange, :bool, default: false
+    config_param :exchange, :string, default: ""
+    config_param :routing_key, :string, default: "#"                       # The routing key used to bind queue to exchange - # = matches all, * matches section (tag.*.info)
 
     def configure(conf)
       conf['format'] ||= conf['payload_format'] # legacy
+      compat_parameters_convert(conf, :parser)
 
       super
 
-      parser = TextParser.new
-      if parser.configure(conf, false)
-        @parser = parser
+      parser_config = conf.elements('parse').first
+      if parser_config
+        @parser = parser_create(conf: parser_config)
       end
 
       @conf = conf
       unless (@host || @hosts) && @queue
-        raise ConfigError, "'host(s)' and 'queue' must be all specified."
+        raise Fluent::ConfigError, "'host(s)' and 'queue' must be all specified."
       end
       check_tls_configuration
     end
@@ -78,11 +69,11 @@ module Fluent
       @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 = @channel.queue(@queue, passive: @passive, durable: @durable,
+                       exclusive: @exclusive, auto_delete: @auto_delete)
       if @bind_exchange
         log.info "Binding #{@queue} to #{@exchange}, :routing_key => #{@routing_key}"
-        q.bind(exchange=@exchange, :routing_key => @routing_key)
+        q.bind(exchange=@exchange, routing_key: @routing_key)
       end
 
       q.subscribe do |delivery, meta, msg|
@@ -128,16 +119,16 @@ module Fluent
 
     def parse_time( meta )
       if @time_header && meta[:headers][@time_header]
-        Time.parse( meta[:headers][@time_header] ).to_i
+        Fluent::EventTime.from_time(Time.parse( meta[:headers][@time_header] ))
       else
-        Time.new.to_i
+        Fluent::Engine.now
       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."
+            raise Fluent::ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
         end
       end
     end
@@ -145,13 +136,13 @@ module Fluent
     def get_connection_options()
       hosts = @hosts ||= Array.new(1, @host)
       opts = {
-        :hosts => hosts, :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
+        hosts: hosts, 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
@@ -159,4 +150,4 @@ module Fluent
 
   end # class AMQPInput
 
-end # module Fluent
+end # module Fluent::Plugin

data/lib/fluent/plugin/out_amqp.rb

@@ -1,13 +1,17 @@
 require 'json'
-require 'fluent/output'
+require 'fluent/plugin/output'
+require "bunny"
 
-
-module Fluent
+module Fluent::Plugin
   ##
   # AMQPOutput to be used as a Fluent MATCHER, sending messages to a RabbitMQ
   # messaging broker
-  class AMQPOutput < BufferedOutput
-    Plugin.register_output("amqp", self)
+  class AMQPOutput < Output
+    Fluent::Plugin.register_output("amqp", self)
+
+    helpers :compat_parameters
+
+    DEFAULT_BUFFER_TYPE = "memory"
 
     attr_accessor :connection
 
@@ -16,44 +20,44 @@ module Fluent
     attr_reader :channel
 
 
-    config_param :host, :string, :default => nil
-    config_param :hosts, :array, :default => nil
-    config_param :user, :string, :default => "guest"
-    config_param :pass, :string, :default => "guest", :secret => true
-    config_param :vhost, :string, :default => "/"
-    config_param :port, :integer, :default => 5672
-    config_param :ssl, :bool, :default => false
-    config_param :verify_ssl, :bool, :default => false
-    config_param :heartbeat, :integer, :default => 60
-    config_param :exchange, :string, :default => ""
-    config_param :exchange_type, :string, :default => "direct"
-    config_param :passive, :bool, :default => false
-    config_param :durable, :bool, :default => false
-    config_param :auto_delete, :bool, :default => false
-    config_param :key, :string, :default => nil
-    config_param :persistent, :bool, :default => false
-    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
-      require "bunny"
+    config_param :host, :string, default: nil
+    config_param :hosts, :array, default: nil
+    config_param :user, :string, default: "guest"
+    config_param :pass, :string, default: "guest", secret: true
+    config_param :vhost, :string, default: "/"
+    config_param :port, :integer, default: 5672
+    config_param :ssl, :bool, default: false
+    config_param :verify_ssl, :bool, default: false
+    config_param :heartbeat, :integer, default: 60
+    config_param :exchange, :string, default: ""
+    config_param :exchange_type, :string, default: "direct"
+    config_param :passive, :bool, default: false
+    config_param :durable, :bool, default: false
+    config_param :auto_delete, :bool, default: false
+    config_param :key, :string, default: nil
+    config_param :persistent, :bool, default: false
+    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
+
+    config_section :buffer do
+      config_set_default :@type, DEFAULT_BUFFER_TYPE
     end
 
     def configure(conf)
+      compat_parameters_convert(conf, :buffer)
       super
       @conf = conf
       unless @host || @hosts
-        raise ConfigError, "'host' or 'hosts' must be specified."
+        raise Fluent::ConfigError, "'host' or 'hosts' must be specified."
       end
       unless @key || @tag_key
-        raise ConfigError, "Either 'key' or 'tag_key' must be set."
+        raise Fluent::ConfigError, "Either 'key' or 'tag_key' must be set."
       end
       check_tls_configuration
     end
@@ -72,14 +76,18 @@ module Fluent
 
       log.info "Creating new exchange #{@exchange}"
       @channel = @connection.create_channel
-      @exch = @channel.exchange(@exchange, :type => @exchange_type.intern,
-                              :passive => @passive, :durable => @durable,
-                              :auto_delete => @auto_delete)
+      @exch = @channel.exchange(@exchange, type: @exchange_type.intern,
+                              passive: @passive, durable: @durable,
+                              auto_delete: @auto_delete)
     end
 
     def shutdown
-      super
       @connection.stop
+      super
+    end
+
+    def formatted_to_msgpack_binary
+      true
     end
 
     def format(tag, time, record)
@@ -92,7 +100,7 @@ module Fluent
           begin
             data = JSON.dump( data ) unless data.is_a?( String )
             log.debug "Sending message #{data}, :key => #{routing_key( tag)} :headers => #{headers(tag,time)}"
-            @exch.publish(data, :key => routing_key( tag ), :persistent => @persistent, :headers => headers( tag, time ))
+            @exch.publish(data, key: routing_key( tag ), persistent: @persistent, headers: headers( tag, time ))
           rescue JSON::GeneratorError => e
             log.error "Failure converting data object to json string: #{e.message}"
             # Debug only - otherwise we may pollute the fluent logs with unparseable events and loop
@@ -134,7 +142,7 @@ module Fluent
     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."
+            raise Fluent::ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
         end
       end
     end
@@ -142,13 +150,13 @@ module Fluent
     def get_connection_options()
       hosts = @hosts ||= Array.new(1, @host)
       opts = {
-        :hosts => hosts, :port => @port, :vhost => @vhost,
-        :pass => @pass, :user => @user, :ssl => @ssl,
-        :verify_ssl => @verify_ssl, :heartbeat => @heartbeat,
-        :tls                 => @tls || nil,
-        :tls_cert            => @tls_cert,
-        :tls_key             => @tls_key,
-        :verify_peer         => @tls_verify_peer
+        hosts: hosts, port: @port, vhost: @vhost,
+        pass: @pass, user: @user, ssl: @ssl,
+        verify_ssl: @verify_ssl, heartbeat: @heartbeat,
+        tls: @tls || nil,
+        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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors:
 - Hiromi Ishii
@@ -12,150 +11,130 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: amq-protocol
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
+        version: 0.14.8
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.8
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: bunny-mock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 description: AMQP input/output plugin for fluentd
@@ -165,35 +144,31 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
+- LICENSE.txt
 - lib/fluent/plugin/in_amqp.rb
 - lib/fluent/plugin/out_amqp.rb
-- LICENSE.txt
 homepage: http://github.com/giraffi/fluent-plugin-amqp
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3868625175639122764
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AMQP input/output plugin or fluentd
 test_files: []