fluent-plugin-nats 0.0.4 → 0.0.5

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-nats (0.0.4)
+    fluent-plugin-nats (0.0.5)
       eventmachine (= 0.12.10)
       fluentd (>= 0.10.7)
       nats (>= 0.4.22)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     cool.io (1.1.0)
       iobuffer (>= 1.0.0)

data/README.md

@@ -18,7 +18,8 @@ Setup the NATS input:
     port 4222
     user nats
     password nats
-    queue fluent.>
+    queue fluent.>,fluent2.>
+    ssl false
   </source>
 ~~~~~
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/fluent/plugin/in_nats.rb

@@ -8,6 +8,9 @@ module Fluent
     config_param :port, :integer, :default => 4222
     config_param :queue, :string, :default => "fluent.>"
     config_param :tag, :string, :default => "nats"
+    config_param :ssl, :bool, :default => false
+    config_param :max_reconnect_attempts, :integer, :default => 150
+    config_param :reconnect_time_wait, :integer, :default => 2
 
     def initialize
       require "nats/client"
@@ -19,10 +22,18 @@ module Fluent
     def configure(conf)
       super
       @conf = conf
-      @uri = "nats://#{@user}:#{@password}@#{@host}:#{@port}"
       unless @host && @queue
         raise ConfigError, "'host' and 'queue' must be all specified."
       end
+
+      @nats_config = {
+        :uri => "nats://#{@host}:#{@port}",
+        :ssl => @ssl,
+        :user => @user,
+        :pass => @password,
+        :reconnect_time_wait => @reconnect_time_wait,
+        :max_reconnect_attempts => @max_reconnect_attempts,
+      }
     end
 
     def start
@@ -41,13 +52,21 @@ module Fluent
     end
 
     def run
+      queues = @queue.split(',')
       EM.next_tick {
-        @nats_conn = NATS.connect(:uri => @uri) {
-          @nats_conn.subscribe(@queue) do |msg, reply, sub|
-            tag = "#{@tag}.#{sub}"
-            msg_json = JSON.parse(msg)
-            time = msg_json["fluent_timestamp"] || Time.now.to_i 
-            Engine.emit(tag, time, msg_json)
+        @nats_conn = NATS.connect(@nats_config) {
+          queues.each do |queue|
+            @nats_conn.subscribe(queue) do |msg, reply, sub|
+              tag = "#{@tag}.#{sub}"
+              begin
+                msg_json = JSON.parse(msg)
+              rescue JSON::ParserError => e
+                $log.error "Failed parsing JSON #{e.inspect}.  Passing as a normal string"
+                msg_json = msg
+              end
+              time = Engine.now
+              Engine.emit(tag, time, msg_json)
+            end
           end
         }
       }

data/test/plugin/in_nats.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'fluent/test'
-require 'lib/fluent/plugin/in_nats'
+require 'lib/fluent/plugin/in_nats.rb'
 require 'nats/client'
 require 'test_helper'
 
@@ -12,16 +12,32 @@ class NATSInputTest < Test::Unit::TestCase
     host localhost
     user nats
     password nats
-    queue fluent.>
   ]
 
-  
+  def basic_queue_conf
+    conf = CONFIG + %[
+      queue fluent.>
+    ]
+  end
+
+  def multiple_queue_conf
+    conf = CONFIG + %[
+      queue fluent.>, fluent2.>
+    ]
+  end
+
+  def ssl_conf
+    conf = basic_queue_conf + %[
+      ssl true
+    ]
+  end
+
   def create_driver(conf=CONFIG)
     Fluent::Test::InputTestDriver.new(Fluent::NATSInput).configure(conf)
   end
   
-  def test_configure
-    d = create_driver
+  def test_configure_basic
+    d = create_driver basic_queue_conf
     assert_equal 4222, d.instance.port
     assert_equal 'localhost', d.instance.host
     assert_equal 'nats', d.instance.user
@@ -29,8 +45,27 @@ class NATSInputTest < Test::Unit::TestCase
     assert_equal 'fluent.>', d.instance.queue
   end
 
+  def test_configure_multiple_queue
+    d = create_driver multiple_queue_conf
+    assert_equal 4222, d.instance.port
+    assert_equal 'localhost', d.instance.host
+    assert_equal 'nats', d.instance.user
+    assert_equal 'nats', d.instance.password
+    assert_equal 'fluent.>, fluent2.>', d.instance.queue
+  end
+
+  def test_configure_basic_with_ssl
+    d = create_driver ssl_conf
+    assert_equal 4222, d.instance.port
+    assert_equal 'localhost', d.instance.host
+    assert_equal 'nats', d.instance.user
+    assert_equal 'nats', d.instance.password
+    assert_equal 'fluent.>', d.instance.queue
+    assert_equal true, d.instance.ssl
+  end
+
   def test_emit_with_credentials
-    d = create_driver
+    d = create_driver basic_queue_conf
 
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
     Fluent::Engine.now = time
@@ -51,13 +86,36 @@ class NATSInputTest < Test::Unit::TestCase
   end
 
   def test_emit_without_credentials
-    d = create_driver
+    d = create_driver basic_queue_conf
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "nats.fluent.test1", time, {"message"=>'nats', "fluent_timestamp"=>time}
+    d.expect_emit "nats.fluent.test2", time, {"message"=>'nats', "fluent_timestamp"=>time}
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each { |tag, time, record|
+        send(uri, tag[5..-1], record)
+        sleep 0.5
+      }
+    end
+    kill_nats
+  end
+
+  def test_emit_multiple_queues
+    d = create_driver multiple_queue_conf
 
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
     Fluent::Engine.now = time
 
     d.expect_emit "nats.fluent.test1", time, {"message"=>'nats', "fluent_timestamp"=>time}
     d.expect_emit "nats.fluent.test2", time, {"message"=>'nats', "fluent_timestamp"=>time}
+    d.expect_emit "nats.fluent2.test1", time, {"message"=>'nats', "fluent_timestamp"=>time}
+    d.expect_emit "nats.fluent2.test2", time, {"message"=>'nats', "fluent_timestamp"=>time}
 
     uri = "nats://#{d.instance.host}:#{d.instance.port}"
 
@@ -72,6 +130,83 @@ class NATSInputTest < Test::Unit::TestCase
   end
 
 
+  def test_emit_without_fluent_timestamp
+    d = create_driver basic_queue_conf
+
+    time = Time.now.to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "nats.fluent.test1", time, {"message"=>'nats'}
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each do |tag, time, record|
+        send(uri, tag[5..-1], record)
+        sleep 0.5
+      end
+    end
+    kill_nats
+  end
+
+  def test_emit_arrays
+    d = create_driver basic_queue_conf
+
+    time = Time.now.to_i
+    Fluent::Engine.now = time
+  
+    d.expect_emit "nats.fluent.empty_array", time, []
+    d.expect_emit "nats.fluent.string_array", time, %w(one two three)
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each do |tag, time, record|
+        send(uri, tag[5..-1], record)
+        sleep 0.5
+      end
+    end
+    kill_nats
+  end
+
+  def test_empty_publish_string
+    d = create_driver basic_queue_conf
+
+    time = Time.now.to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "nats.fluent.nil", time, nil
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each do |tag, time, record|
+        send(uri, tag[5..-1], nil)
+        sleep 0.5
+      end
+    end
+    kill_nats
+  end
+
+  def test_regular_publish_string
+    d = create_driver basic_queue_conf
+
+    time = Time.now.to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "nats.fluent.string", time, "Lorem ipsum dolor sit amet"
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each do |tag, time, record|
+        send(uri, tag[5..-1], "Lorem ipsum dolor sit amet")
+        sleep 0.5
+      end
+    end
+    kill_nats
+  end
+
   def setup
     Fluent::Test.setup
   end
@@ -84,3 +219,5 @@ class NATSInputTest < Test::Unit::TestCase
     }
   end
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nats
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd