fluent-plugin-amqp 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e5ef78a2bf85bbc437eb8df64cdb638c0337044
-  data.tar.gz: ee1114cb9e1da07cf4273cc4725fbdba30077f02
+  metadata.gz: eef8bc33986f21193cd21ba5c24fc4dbee37acf6
+  data.tar.gz: 64e2b306228f5e9c0bb01c02f8e6c69bd116b3e9
 SHA512:
-  metadata.gz: de068f84be516289eb63ad457fd3b79694362638930821274f6aed006f5ccdbc989f549792d0c4c8ab2a867d2dec5149fd80cba276e7af32dac660e03e275b33
-  data.tar.gz: 90c7ea3f6cb02d9690f426d2f1c81d09d9bb49f1374dc530addc279578f5720d4eed43fcc5ea6495fb243ac52c550164218180842d794b056d09ebe2612bbf1e
+  metadata.gz: 82b65b1bb57b83f7ed42e87a6d1ce09c9677899f7bf0f8e16788ec95da5127f60361825dfe1210f7b0c16f083e4c3c49c6d2588cd23223c2cd178d6bfa2f64c0
+  data.tar.gz: f90d37341d01a3e9ec2de90b44f1c916e89d981ca09ebfc7dbbf9a4c8ea72618a2d9ad65794de90e47dd93e5e4735a44c24d84f391bb3986c25871ad18a32f90

data/lib/fluent/plugin/in_amqp.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Fluent
   class AMQPInput < Input
     Fluent::Plugin.register_input('amqp', self)
@@ -23,6 +25,9 @@ module Fluent
     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
 
     def initialize
       require 'bunny'
@@ -63,9 +68,9 @@ module Fluent
       @bunny.start
       q = @bunny.queue(@queue, :passive => @passive, :durable => @durable,
                        :exclusive => @exclusive, :auto_delete => @auto_delete)
-      q.subscribe do |_, _, msg|
+      q.subscribe do |delivery, meta, msg|
         payload = parse_payload(msg)
-        router.emit(@tag, Time.new.to_i, payload)
+        router.emit(parse_tag(delivery, meta), parse_time(meta), payload)
       end
     end # AMQPInput#run
 
@@ -86,6 +91,24 @@ module Fluent
         { "message" => msg }
       end
     end
+
+    def parse_tag( delivery, meta )
+      if @tag_key && delivery.routing_key != ''
+        delivery.routing_key
+      elsif @tag_header && meta[:headers][@tag_header]
+        meta[:headers][@tag_header]
+      else
+        @tag
+      end
+    end
+
+    def parse_time( meta )
+      if @time_header && meta[:headers][@time_header]
+        Time.parse( meta[:headers][@time_header] ).to_i
+      else
+        Time.new.to_i
+      end
+    end
   end # class AMQPInput
 
 end # module Fluent

data/lib/fluent/plugin/out_amqp.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Fluent
   class AMQPOutput < BufferedOutput
     Plugin.register_output("amqp", self)
@@ -16,6 +17,9 @@ module Fluent
     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
 
     def initialize
       super
@@ -25,8 +29,11 @@ module Fluent
     def configure(conf)
       super
       @conf = conf
-      unless @host && @exchange && @key
-        raise ConfigError, "'host', 'exchange' and 'key' must be all specified."
+      unless @host && @exchange
+        raise ConfigError, "'host' and 'exchange' must be all 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)
@@ -46,12 +53,28 @@ module Fluent
     end
 
     def format(tag, time, record)
-      record.to_msgpack
+      [tag, time, record].to_msgpack
     end
 
     def write(chunk)
-      chunk.msgpack_each do |data|
-        @exch.publish(data, :key => @key, :persistent => @persistent)
+      chunk.msgpack_each do |(tag, time, data)|
+        data = JSON.dump( data ) unless data.is_a?( String )
+        @exch.publish(data, :key => routing_key( tag ), :persistent => @persistent, :headers => headers( tag, time ))
+      end
+    end
+
+    def routing_key( tag )
+      if @tag_key
+        tag
+      else
+        @key
+      end
+    end
+
+    def headers( tag, time )
+      {}.tap do |h|
+        h[@tag_header] = tag if @tag_header
+        h[@time_header] = Time.at(time).utc.to_s if @time_header
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Hiromi Ishii