fluent-plugin-rabbitmq 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe96873dd049e18d49cf46c8e220635c67b96c22d71fd72c51441f3cc7c794d
-  data.tar.gz: ee06d3de86ca93ac03c540eeac105f18b1ccc99ea897c05c40b46a0aee926d3e
+  metadata.gz: ba10e05d65915a58bac7723586f08bab88d3eb265a44cdc2a4fbf60d3153dead
+  data.tar.gz: 7c74417e879e6332f70c943b9c732e7628526687ec8e5613b45767835e36bcd5
 SHA512:
-  metadata.gz: 8e00500844dd157eb22b002ec2d9338c13b516062a0297be5ad90fb2fdf27424d9e443e7e380ac0d58b01ea475b699affdb832a804f8ddcd175c576e30d46a2e
-  data.tar.gz: 5d31f9ce8e15e6337e38d252f9c3a0fe6a65adf05704850ac68d44b7e780b121507406856799f5919391d7bf848eb4537e661e14ff52f401447afa2a083d0010
+  metadata.gz: 11358bb5ae097666f025d6eafd3a975fa3295772ab97701c5084bb79d889db624e873d36088ff629015ffe99415ea0d3e2f5971216ce5ed4e10424284783cfd7
+  data.tar.gz: f07b05667ca3593c0d7c858b356d4ed39ab7b7451100493bf8c9cc52e79e728d974b1afa664693db7278a79d0ed3bf6dac7a8baee286c172c60a3251b2e29a92

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .gem
+.idea

data/.travis.yml

@@ -1,7 +1,12 @@
 language: ruby
 rvm:
-  - 2.4
+  - 2.6
 cache: bundler
 dist: xenial
+sudo: true
 services:
   - rabbitmq
+addons:
+  apt:
+    packages:
+      - rabbitmq-server

data/README.md

@@ -46,10 +46,16 @@ fluentd >= 0.14.0
 |durable|true|false|set durable flag of the queue|
 |exclusive|true|false|set exclusive flag of the queue|
 |auto_delete|true|false|set auto_delete flag of the queue|
+|ttl|60000|nil|queue ttl in ms|
 |prefetch_count|10|nil||
 |consumer_pool_size|5|nil||
 |include_headers|true|false|include headers in events|
 |headers_key|string|header|key name of headers|
+|create_exchange|true|false|create exchange or not|
+|exchange_to_bind|string|nil|exchange to bind created exchange|
+|exchange_type|direct|topic|type of created exchange|
+|exchange_routing_key|hoge|nil|created exchange routing key|
+|exchange_durable|true|false|durability of create exchange|
 
 ### Output
 

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.6"
+  spec.version       = "0.0.7"
   spec.authors       = ["NTT Communications"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd", ">= 0.14.0"
 
-  spec.add_dependency "bunny", "~> 2.13.0"
+  spec.add_dependency "bunny", "~> 2.14.2"
 end

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -34,7 +34,7 @@ module Fluent::Plugin
     config_param :user, :string, default: nil
     config_param :pass, :string, default: nil, secret: true
     config_param :vhost, :string, default: nil
-    config_param :exchange, :string, default: nil
+
     config_param :routing_key, :string, default: nil
     config_param :connection_timeout, :time, default: nil
     config_param :continuation_timeout, :integer, default: nil
@@ -47,6 +47,13 @@ module Fluent::Plugin
     end
     config_param :consumer_pool_size, :integer, default: nil
 
+    config_param :exchange, :string, default: nil
+    config_param :create_exchange, :bool, default: false
+    config_param :exchange_to_bind, :string, default: nil
+    config_param :exchange_type, :string, default: "topic"
+    config_param :exchange_routing_key, :string, default: nil
+    config_param :exchange_durable, :bool, default: false
+    
     config_param :tls, :bool, default: false
     config_param :tls_cert, :string, default: nil
     config_param :tls_key, :string, default: nil
@@ -57,8 +64,8 @@ module Fluent::Plugin
     config_param :durable, :bool, default: false
     config_param :exclusive, :bool, default: false
     config_param :auto_delete, :bool, default: false
-
     config_param :prefetch_count, :integer, default: nil
+    config_param :ttl, :integer, default: nil
 
     config_param :include_headers, :bool, default: false
     config_param :headers_key, :string, default: "headers"
@@ -106,11 +113,23 @@ module Fluent::Plugin
       @bunny.start
       channel = @bunny.create_channel(nil, @consumer_pool_size)
       channel.prefetch(@prefetch_count) if @prefetch_count
+      if @create_exchange
+        exchange_options = {
+            durable: @exchange_durable,
+            auto_delete: @auto_delete
+        }
+        @bunny_exchange = Bunny::Exchange.new(channel, @exchange_type, @exchange, exchange_options)
+        if @exchange_to_bind
+          @bunny_exchange.bind(@exchange_to_bind, routing_key: @exchange_routing_key)
+        end
+      end
+      queue_arguments = {"x-message-ttl" => @ttl} if @ttl
       queue = channel.queue(
         @queue,
         durable: @durable,
         exclusive: @exclusive,
-        auto_delete: @auto_delete
+        auto_delete: @auto_delete,
+        arguments: queue_arguments
       )
       if @exchange
         queue.bind(@exchange, routing_key: @routing_key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - NTT Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.2
 description: fluent plugin for rabbitmq (AMQP)
 email:
 - masaki.matsushita@ntt.com
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: fluent plugin for rabbitmq (AMQP)