fluent-plugin-rabbitmq 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2862045bd52ab3ffede55b32f2cc7c647bf8bd3542587119583df1a705de83
-  data.tar.gz: f9d540ed910f388a94f1a8dc4b4be809c60a417e7b3d06f693c4d1ff17f1adb0
+  metadata.gz: fbe96873dd049e18d49cf46c8e220635c67b96c22d71fd72c51441f3cc7c794d
+  data.tar.gz: ee06d3de86ca93ac03c540eeac105f18b1ccc99ea897c05c40b46a0aee926d3e
 SHA512:
-  metadata.gz: bc87a28220cbbc8bea682edccaa93075b4cae213453673eaed593e27470ed330359dcd2b4a924256987e4706265b763eeebc624cf0e99366b21ebdf50dc2021d
-  data.tar.gz: fcdb0456520efc73a6309c6e05dac06155754461f6867e8d2b44cec9400be7430adb37e4e47dfed21dca9c2217b3b13127134924e0a39970a73c8eccb8caf864
+  metadata.gz: 8e00500844dd157eb22b002ec2d9338c13b516062a0297be5ad90fb2fdf27424d9e443e7e380ac0d58b01ea475b699affdb832a804f8ddcd175c576e30d46a2e
+  data.tar.gz: 5d31f9ce8e15e6337e38d252f9c3a0fe6a65adf05704850ac68d44b7e780b121507406856799f5919391d7bf848eb4537e661e14ff52f401447afa2a083d0010

data/README.md

@@ -34,6 +34,8 @@ fluentd >= 0.14.0
   <parse>
     @type json # or msgpack, ltsv, none
   </parse>
+  <buffer> # to use in buffered mode
+  </buffer>
 </source>
 ```
 
@@ -78,11 +80,13 @@ fluentd >= 0.14.0
 |persistent|true|false|messages is persistent to disk|
 |timestamp|true|false|if true, time of record is used as timestamp in AMQP message|
 |content_type|application/json|nil|message content type|
+|frame_max|131072|nil|maximum permissible size of a frame|
 |mandatory||true|nil||
 |expiration|3600|nil|message time-to-live|
 |message_type||nil||
 |priority||nil||
 |app_id||nil||
+|id_key|message_id|nil|id to specify message_id|
 
 ### TLS related configurations
 

data/fluent-plugin-rabbitmq.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["NTT Communications"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 

data/lib/fluent/plugin/out_rabbitmq.rb

@@ -42,6 +42,7 @@ module Fluent::Plugin
       param == "server" ? :server : Integer(param)
     end
     config_param :threaded, :bool, default: true
+    config_param :frame_max, :integer, default: nil
 
     config_param :tls, :bool, default: false
     config_param :tls_cert, :string, default: nil
@@ -55,9 +56,10 @@ module Fluent::Plugin
 
     config_param :persistent, :bool, default: false
     config_param :routing_key, :string, default: nil    
+    config_param :id_key, :string, default: nil
     config_param :timestamp, :bool, default: false
     config_param :content_type, :string, default: nil
-    config_param :mandatory, :bool, default: nil
+    config_param :content_encoding, :string, default: nil
     config_param :expiration, :integer, default: nil
     config_param :message_type, :integer, default: nil
     config_param :priority, :integer, default: nil
@@ -87,8 +89,8 @@ module Fluent::Plugin
       bunny_options[:recovery_attempts] = @recovery_attempts
       bunny_options[:auth_mechanism] = @auth_mechanism if @auth_mechanism
       bunny_options[:heartbeat] = @heartbeat if @heartbeat
-      bunny_options[:threaded] = @threaded
       bunny_options[:logger] = log
+      bunny_options[:frame_max] = @frame_max if @frame_max
 
       bunny_options[:tls] = @tls
       bunny_options[:tls_cert] = @tls_cert if @tls_cert
@@ -100,6 +102,7 @@ module Fluent::Plugin
 
       @publish_options = {}
       @publish_options[:content_type] = @content_type if @content_type
+      @publish_options[:content_encoding] = @content_encoding if @content_encoding
       @publish_options[:persistent] = @persistent if @persistent
       @publish_options[:mandatory] = @mandatory if @mandatory
       @publish_options[:expiration] = @expiration if @expiration
@@ -107,13 +110,17 @@ module Fluent::Plugin
       @publish_options[:priority] = @priority if @priority
       @publish_options[:app_id] = @app_id if @app_id
 
-      @formatter = formatter_create
+      @formatter = formatter_create(default_type: @type)
     end
 
     def multi_workers_ready?
       true
     end
 
+    def prefer_buffered_processing
+      false
+    end
+
     def start
       super
       @bunny.start
@@ -130,26 +137,37 @@ module Fluent::Plugin
       super
     end
 
-    def process(tag, es)
+    def set_publish_options(tag, time, record)
+      @publish_options[:timestamp] = time.to_i if @timestamp
+
       if @exchange_type != "fanout"
         @publish_options[:routing_key] = @routing_key ? @routing_key : tag
       end
-      es.each do |time, record|
-        @publish_options[:timestamp] = time.to_i if @timestamp
-        formatted = format(tag, time, record)
-        @bunny_exchange.publish(formatted, @publish_options)
+
+      if @id_key
+        id = record[@id_key]
+        @publish_options[:message_id] = id if id
       end
     end
 
-    def multi_workers_ready?
-      true
+    def process(tag, es)
+      es.each do |time, record|
+        set_publish_options(tag, time, record)
+        record = inject_values_to_record(tag, time, record)
+        buf = @formatter.format(tag, time, record)
+        @bunny_exchange.publish(buf, @publish_options)
+      end
     end
 
-    private
+    def write(chunk)
+      tag = chunk.metadata.tag
 
-    def format(tag, time, record)
-      record = inject_values_to_record(tag, time, record)
-      @formatter.format(tag, time, record)
+      chunk.each do |time, record|
+        set_publish_options(tag, time, record)
+        record = inject_values_to_record(tag, time, record)
+        buf = @formatter.format(tag, time, record)
+        @bunny_exchange.publish(buf, @publish_options)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - NTT Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler