fluent-plugin-amqp2 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 442969f48ef362b5ab9506ad2869e865374b4b43
-  data.tar.gz: 44618c26a724d729b7544a1493adad7b2b63a308
+  metadata.gz: beec074fa413a6c39d5f9dca6200eb4e31b08f7c
+  data.tar.gz: 7ce95fdc118df30ea71050d45c0e54c4e74a2df1
 SHA512:
-  metadata.gz: 5d74298b7f7383e87303a5a48205dd71708d3429c7eae222bd74097866cbf8432f0babee2a5c4409581b6655f08b6ea15b13fa9dab2dba9a56a4d7365f294264
-  data.tar.gz: 91c311d76ad18fc3fcd7a9dcd98cdc52e9cf17c9f8a3d29f0c0671b7cfc874918f6d147b1a66af53117f60773b61c4357c418bebb03a9a35cf8cdc13b7a108d4
+  metadata.gz: 771df5ba0f7fc2706d2c3fe08a63e55ce87f9da1df344ca39950965a6ad8c06bbfd4353542c6da4611dd3ff4019936839d5080b3afb7848a6d33f76e8fb51d45
+  data.tar.gz: ed0095bf9f82cfa2462a1d0186697f6daaaadc3b51b03caa90cc7848a2cf2b485c5d282c288838d3adf577a27b357be8583ec6b4c55214beb17fa8fd7c11c369

data/README.md

@@ -43,6 +43,7 @@ Or install it yourself as:
   exchange_durable true # optionally set exchange durability - default is true.
   payload_only false # optional - default is false. if true, only the payload will be sent. if false, data format is { "key" => tag, "timestamp" => time, "payload" => record }.
   content_type application/octet-stream # optional - default is application/octet-stream. some amqp consumers will expect application/json.
+  priority 0 # the priority for the message - requires bunny >= 1.1.6 and rabbitmq >= 3.5
 </match>
 ```
 

data/fluent-plugin-amqp2.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-amqp2"
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
   gem.authors       = ["Augusto Becciu", "Juan Manuel Barreneche"]
   gem.email         = ["devs@restorando.com"]
 

data/lib/fluent/plugin/out_amqp.rb

@@ -15,6 +15,7 @@ class AmqpOutput < Fluent::BufferedOutput
   config_param :exchange_durable, :bool, default: true
   config_param :payload_only, :bool, default: false
   config_param :content_type, :string, default: "application/octet-stream"
+  config_param :priority, :integer, default: nil
 
   def initialize(*)
     super
@@ -66,7 +67,11 @@ class AmqpOutput < Fluent::BufferedOutput
   def write(chunk)
     chunk.msgpack_each do |(tag, time, record)|
       event = @payload_only ? record : { "key" => tag, "timestamp" => time, "payload" => record }
-      get_or_create_exchange.publish Yajl.dump(event), routing_key: tag, content_type: @content_type
+      puboptions = { routing_key: tag, content_type: @content_type }
+      if @priority
+        puboptions[:priority] = @priority
+      end
+      get_or_create_exchange.publish Yajl.dump(event), puboptions
     end
   end
 

data/test/out_amqp.rb

@@ -23,6 +23,18 @@ class AmqpOutputTest < Test::Unit::TestCase
     buffert_type memory
   ]
 
+  PRIORITYCONFIG = %[
+    host localhost
+    port 3333
+    user test
+    password test
+    vhost /test
+    exchange test-exchange
+    exchange_type topic
+    priority 3
+    buffert_type memory
+  ]
+
   def create_driver(conf = CONFIG)
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::AmqpOutput).configure(conf)
   end
@@ -38,6 +50,18 @@ class AmqpOutputTest < Test::Unit::TestCase
     assert_equal "topic", d.instance.exchange_type
   end
 
+  def test_configure_with_priority
+    d = create_driver PRIORITYCONFIG
+    assert_equal "localhost", d.instance.host
+    assert_equal 3333, d.instance.port
+    assert_equal "test", d.instance.user
+    assert_equal "test", d.instance.password
+    assert_equal "/test", d.instance.vhost
+    assert_equal "test-exchange", d.instance.exchange
+    assert_equal "topic", d.instance.exchange_type
+    assert_equal 3, d.instance.priority
+  end
+
   def test_start_and_shutdown
     d = create_driver
 
@@ -81,5 +105,25 @@ class AmqpOutputTest < Test::Unit::TestCase
     d.run
   end
 
+  def test_flush_with_priority
+    d = create_driver PRIORITYCONFIG
+
+    amqp_conn_mock = mock()
+    amqp_exchange_mock = mock()
+    Bunny.stubs(:new).returns(amqp_conn_mock)
+    amqp_conn_mock.stubs(:open?).returns(true)
+    amqp_conn_mock.stubs(:create_channel)
+    amqp_conn_mock.stubs(:stop)
+    Bunny::Exchange.stubs(:new).returns(amqp_exchange_mock)
+
+    t = Time.now.to_i
+    d.emit({"a" => 1}, t)
+
+    ev1 = Yajl.dump({"key" => "test", "timestamp" => t, "payload" => {"a"=>1}})
+    amqp_exchange_mock.expects(:publish).with(ev1, { routing_key: "test", content_type: 'application/octet-stream', priority: 3 })
+
+    d.run
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Augusto Becciu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: AMQP output plugin for Fluent