fluent-plugin-nats 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-nats (0.0.2)
+    fluent-plugin-nats (0.0.4)
+      eventmachine (= 0.12.10)
       fluentd (>= 0.10.7)
       nats (>= 0.4.22)
 
@@ -12,7 +13,7 @@ GEM
       iobuffer (>= 1.0.0)
     daemons (1.1.9)
     eventmachine (0.12.10)
-    fluentd (0.10.25)
+    fluentd (0.10.28)
       cool.io (~> 1.1.0)
       http_parser.rb (~> 0.5.1)
       json (>= 1.4.3)
@@ -23,14 +24,13 @@ GEM
     json (1.7.5)
     json_pure (1.7.5)
     msgpack (0.4.7)
-    nats (0.4.26)
+    nats (0.4.28)
       daemons (>= 1.1.5)
-      eventmachine (>= 0.12.10)
+      eventmachine (= 0.12.10)
       json_pure (>= 1.7.3)
       thin (>= 1.4.1)
     rack (1.4.1)
     rake (0.9.2.2)
-    rr (1.0.4)
     thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -43,4 +43,3 @@ PLATFORMS
 DEPENDENCIES
   fluent-plugin-nats!
   rake (>= 0.9.2)
-  rr (>= 1.0.0)

data/README.md

@@ -1,7 +1,8 @@
 fluent-plugin-nats
 ==================
 
-NATS plugin for fluent Event Collector
+[NATS](https://github.com/derekcollison/nats) plugin for
+[fluentd](https://github.com/fluent/fluentd) Event Collector
 
 [![Build Status](https://secure.travis-ci.org/achied/fluent-plugin-nats.png)](http://travis-ci.org/achied/fluent-plugin-nats)
 
@@ -12,6 +13,7 @@ Setup the NATS input:
 ~~~~~
   <source>
     type nats
+    tag nats
     host localhost
     port 4222
     user nats
@@ -20,6 +22,14 @@ Setup the NATS input:
   </source>
 ~~~~~
 
+Setup the match output:
+
+~~~~
+  <match nats.fluent.**>
+    type stdout
+  </match>
+~~~~
+
 # Suitable Queues
 
 ## Components

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/fluent-plugin-nats.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Eduardo Aceituno"]
   gem.email       = ["achied@gmail.com"]
   gem.homepage    = "https://github.com/achied/fluent-plugin-nats"
-  gem.summary     = %q{nats plugin for fluent, an event collector}
-  gem.description = %q{nats plugin for fluent, an event collector}
+  gem.summary     = %q{nats plugin for fluentd, an event collector}
+  gem.description = %q{nats plugin for fluentd, an event collector}
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd", ">= 0.10.7"
   gem.add_dependency "nats", ">= 0.4.22"
+  gem.add_dependency "eventmachine", "= 0.12.10"
   
   gem.add_development_dependency "rake", ">= 0.9.2"
-  gem.add_development_dependency "rr", ">= 1.0.0"
 end

data/lib/fluent/plugin/in_nats.rb

@@ -7,6 +7,7 @@ module Fluent
     config_param :password, :string, :default => "nats"
     config_param :port, :integer, :default => 4222
     config_param :queue, :string, :default => "fluent.>"
+    config_param :tag, :string, :default => "nats"
 
     def initialize
       require "nats/client"
@@ -18,7 +19,7 @@ module Fluent
     def configure(conf)
       super
       @conf = conf
-      @uri = "nats://#{user}:#{password}@#{host}:#{port}"
+      @uri = "nats://#{@user}:#{@password}@#{@host}:#{@port}"
       unless @host && @queue
         raise ConfigError, "'host' and 'queue' must be all specified."
       end
@@ -26,38 +27,38 @@ module Fluent
 
     def start
       super
-      $log.info "listening nats on #{@uri}/#{@queue}"
-      @main_thread = Thread.current
+      run_reactor_thread
       @thread = Thread.new(&method(:run))
-      Thread.stop
-      @thread
+      $log.info "listening nats on #{@uri}/#{@queue}"
     end
 
     def shutdown
       super
-      NATS.stop
+      @nats_conn.close
       @thread.join
+      EM.stop if EM.reactor_running?
+      @reactor_thread.join if @reactor_thread
     end
 
     def run
-      if EM.reactor_running?
-        $log.info "Reactor already running"
-        NATS.connect(:uri => @uri) {
-          NATS.subscribe(@queue) do |msg, reply, sub|
-            Engine.emit(sub, 0, msg)
-          end
-          @main_thread.wakeup
-        }
-      else 
-        $log.info "Reactor not running. Starting..."
-        NATS.start(:uri => @uri) {
-          NATS.subscribe(@queue) do |msg, reply, sub|
-            Engine.emit(sub, 0, msg)
+      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)
           end
-          $log.info "Reactor running #{EM.reactor_running?}"
-          @main_thread.wakeup
         }
+      }
+    end
+
+    private
+    def run_reactor_thread
+      unless EM.reactor_running?
+        @reactor_thread = Thread.new { EM.run }
       end
     end
+
   end
 end

data/test/plugin/in_nats.rb

@@ -35,15 +35,15 @@ class NATSInputTest < Test::Unit::TestCase
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
     Fluent::Engine.now = time
 
-    d.expect_emit "fluent.test1", 0, {"message"=>'nats'}.to_json
-    d.expect_emit "fluent.test2", 0, {"message"=>'nats'}.to_json
+    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.user}:#{d.instance.password}@#{d.instance.host}:#{d.instance.port}"
 
     start_nats(uri)
     d.run do
       d.expected_emits.each { |tag, time, record|
-        send(uri, tag, record)
+        send(uri, tag[5..-1], record)
         sleep 0.5
       }
     end
@@ -56,15 +56,15 @@ class NATSInputTest < Test::Unit::TestCase
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
     Fluent::Engine.now = time
 
-    d.expect_emit "fluent.test1", 0, {"message"=>'nats'}.to_json
-    d.expect_emit "fluent.test2", 0, {"message"=>'nats'}.to_json
+    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, record)
+        send(uri, tag[5..-1], record)
         sleep 0.5
       }
     end
@@ -79,7 +79,7 @@ class NATSInputTest < Test::Unit::TestCase
   def send(uri, tag, msg)
     EM.run {
       n = NATS.connect(:uri => uri) 
-      n.publish(tag,msg) 
+      n.publish(tag,msg.to_json) 
       n.close
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nats
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,29 +44,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.22
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
+        version: 0.12.10
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,8 +74,8 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-description: nats plugin for fluent, an event collector
+        version: 0.9.2
+description: nats plugin for fluentd, an event collector
 email:
 - achied@gmail.com
 executables: []
@@ -117,5 +117,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: nats plugin for fluent, an event collector
+summary: nats plugin for fluentd, an event collector
 test_files: []