fluent-plugin-amqp 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac0659509393a3cbe0f5a86a2925e8227e705f23
-  data.tar.gz: 86ab5e6981907aceec58b4a76abab2b1a483341d
+  metadata.gz: e2faee36d9db937fb190935e620e3b39a3dc226d
+  data.tar.gz: 5070a58c8427cb20c1a100105573036fc0d8688f
 SHA512:
-  metadata.gz: 3843d792b1904cffe3846ba20a73838774ab32e9a76254317d728aeb06277bea205fcd530b05d61ba9c620880ab8405d856fc2f15ea40b2a611361cc32025c17
-  data.tar.gz: da272abdad7b8ed575cf617c55cc5076e9d52edc2602385461dee42eedeb275ccde7a037b376b204b48af41eb1ba00db82cc97d3a61b149139770c33e71daea4
+  metadata.gz: d07705f1da8b0618ca41029c5a01a1b453ced2347a829b4e544581d0fb5878f7c383f323911c2be4e30519678faf254123b06073d9b8c7b90e85b7d8a0a962c8
+  data.tar.gz: 2927771afd59c19287d934f5b560845afb57bc705c4799668f581b81ec6d25d907d5b4c6d3f1377dcfb64fb12f12e4fcc522df5005d79bd3e23fe6e39a0dcac7

data/lib/fluent/plugin/in_amqp.rb

@@ -1,6 +1,9 @@
 require 'time'
 
 module Fluent
+  ##
+  # AMQPInput to be used as a Fluent SOURCE, reading messages from a RabbitMQ
+  # message broker
   class AMQPInput < Input
     Fluent::Plugin.register_input('amqp', self)
 
@@ -37,6 +40,11 @@ module Fluent
     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'
@@ -59,33 +67,34 @@ module Fluent
         raise ConfigError, "'host' and 'queue' must be all specified."
       end
       check_tls_configuration
-
     end
 
     def start
       super
-      @thread = Thread.new(&method(:run))
-    end
-
-    def shutdown
-      @connection.stop
-      @thread.join
-      super
-    end
-
-    def run
       # 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)
+      if @bind_exchange
+        log.info "Binding #{@queue} to #{@exchange}, :routing_key => #{@routing_key}"
+        q.bind(exchange=@exchange, :routing_key => @routing_key)
+      end
+
       q.subscribe do |delivery, meta, msg|
+        log.debug "Recieved message #{@msg}"
         payload = parse_payload(msg)
         router.emit(parse_tag(delivery, meta), parse_time(meta), payload)
       end
     end # AMQPInput#run
 
+    def shutdown
+      log.info "Closing connection"
+      @connection.stop
+      super
+    end
+
     private
     def parse_payload(msg)
       if @parser

data/lib/fluent/plugin/out_amqp.rb

@@ -1,5 +1,8 @@
 require 'json'
 module Fluent
+  ##
+  # AMQPOutput to be used as a Fluent MATCHER, sending messages to a RabbitMQ
+  # messaging broker
   class AMQPOutput < BufferedOutput
     Plugin.register_output("amqp", self)
 
@@ -48,9 +51,17 @@ module Fluent
 
     def start
       super
-      @connection = Bunny.new(get_connection_options) unless @connection
+      begin
+        log.info "Connecting to RabbitMQ..."
+        @connection = Bunny.new(get_connection_options) unless @connection
+        @connection.start
+      rescue Bunny::TCPConnectionFailed => e
+        log.error "Connection to #{@host} failed"
+      rescue Bunny::PossibleAuthenticationFailureError => e
+        log.error "Could not authenticate as #{@user}"
+      end
 
-      @connection.start
+      log.info "Creating new exchange #{@exchange}"
       @channel = @connection.create_channel
       @exch = @channel.exchange(@exchange, :type => @exchange_type.intern,
                               :passive => @passive, :durable => @durable,
@@ -69,6 +80,7 @@ module Fluent
     def write(chunk)
       chunk.msgpack_each do |(tag, time, data)|
         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 ))
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Hiromi Ishii
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: AMQP input/output plugin or fluentd