fluent-plugin-zmq 0.0.2 → 0.0.3

data/README.md

@@ -2,46 +2,49 @@ Zeromq plugin for Fluentd
 =============
 fluent-plugin-zmq provides an adaptor between fluentd and zeromq.
 
-Getting Started
-------
-1. setup the source
-> ZeroMQ input
-> <source>
->   type zmq
->   port 4444
-> </source>
+# Getting Started
+Setup the ZeroMQ input:
 
-2. Run a source code.
-> #!/usr/bin/env ruby
-> require 'zmq'
-> require 'msgpack'
->
-> z = ZMQ::Context.new
-> s = z.socket(ZMQ::DOWNSTREAM)
-> s.connect("tcp://127.0.0.1:4444")
-> tag = "debug.test"
-> # echo '{"json":"message"}' | fluent-cat debug.test
-> array = ["key" => "value"]
->
-> def write_impl(s, tag, array)
->   begin
->     s.send([tag, Time.now.to_s, array].to_msgpack)
->   rescue
->     $stderr.puts "write failed: #{$!}"
->     s.close
->     return false
->   end
->
->   return true
-> end
->
-> write_impl(s, tag, array)
-3. Happy logging with zeromq and fluetnd!
+~~~~~
+    <source>
+      type zmq
+      port 4444
+    </source>
+~~~~~
 
+Run a sample code.
 
+~~~~~
+    #!/usr/bin/env ruby
+    require 'zmq'
+    require 'msgpack'
+    
+    z = ZMQ::Context.new
+    s = z.socket(ZMQ::DOWNSTREAM)
+    s.connect("tcp://127.0.0.1:4444")
+    tag = "debug.test"
+    # echo '{"json":"message"}' | fluent-cat debug.test
+    array = ["key" => "value"]
+    
+    def write_impl(s, tag, array)
+      begin
+        s.send([tag, Time.now.to_s, array].to_msgpack)
+      rescue
+        $stderr.puts "write failed: #{$!}"
+        s.close
+        return false
+      end
+    
+      return true
+    end
+    
+    write_impl(s, tag, array)
+~~~~~
 
-TODO
-------
+That's done.
+Happy logging with zeromq and fluetnd! :)
+
+# TODO
 - ZeroMQ output
 - ZeroMQ forwarding
 - JSON support

data/fluent-plugin-zmq.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Fluent::Plugin::Zmq::VERSION
   s.authors     = ["OZAWA Tsuyoshi"]
   s.email       = ["ozawa.tsuyoshi@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/oza/fluent-plugin-zmq"
   s.summary     = %q{zmq plugin for fluent, an event collector}
   s.description = %q{zmq plugin for fluent, an event collector}
 

data/lib/fluent-plugin-zmq/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Zmq
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/lib/fluent/plugin/in_zmq.rb

@@ -51,6 +51,12 @@ class ZMQInput < Input
     @server = @zmq.socket(ZMQ::UPSTREAM)
     @server.bind("tcp://" + @bind + ":" + @port.to_s)
     @thread = Thread.new(&method(:run))
+    @cached_unpacker = MessagePack::Unpacker.new
+  end
+
+  def shutdown
+    @server.close
+    @thread.join
   end
 
   def run
@@ -68,7 +74,7 @@ class ZMQInput < Input
     end
   end
 
-
+  protected
   # message Entry {
   #   1: long time
   #   2: object record
@@ -92,47 +98,37 @@ class ZMQInput < Input
   def on_message(msg)
     # TODO format error
     tag = msg[0].to_s
-    time = msg[1]
-    time = Engine.now if time == 0
-    record = msg[2]
-
-    # for debugging
+    entries = msg[1]
+
+    if entries.class == String
+      # PackedForward
+      es = MessagePackEventStream.new(entries, @cached_unpacker)
+      Engine.emit_stream(tag, es) 
+
+    elsif entries.class == Array
+      # Forward
+      es = MultiEventStream.new
+      entries.each {|e|
+        time = e[0].to_i
+        time = (now ||= Engine.now) if time == 0
+        record = e[1]
+        es.add(time, record)
+      }
+      Engine.emit_stream(tag, es)
+    else
+      # Message
+      time = msg[1]
+      time = Engine.now if time == 0
+      record = msg[2]
+      Engine.emit(tag, time, record)
+    end
     #p tag
     #p time
     #p record
-
-    Engine.emit(tag, time, record)
-
-    # TODO : support other formats
-    #if entries.class == String
-    #  # PackedForward
-    #  es = MessagePackEventStream.new(entries, @cached_unpacker)
-    #  Engine.emit_stream(tag, es)
-
-    #elsif entries.class == Array
-    #  # Forward
-    #  es = MultiEventStream.new
-    #  entries.each {|e|
-    #    time = e[0].to_i
-    #    time = (now ||= Engine.now) if time == 0
-    #    record = e[1]
-    #    es.add(time, record)
-    #  }
-    #  Engine.emit_stream(tag, es)
-
-    #else
-    #  # Message
-    #  time = msg[1]
-    #  time = Engine.now if time == 0
-    #  record = msg[2]
-    #  Engine.emit(tag, time, record)
-    #end
   end
 
-  def shutdown
-    @server.close
-    #@thread.join # TODO
-  end
 end
 
+
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zmq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000Z
 dependencies: []
 description: zmq plugin for fluent, an event collector
 email:
@@ -27,7 +27,7 @@ files:
 - fluent-plugin-zmq.gemspec
 - lib/fluent-plugin-zmq/version.rb
 - lib/fluent/plugin/in_zmq.rb
-homepage: ''
+homepage: https://github.com/oza/fluent-plugin-zmq
 licenses: []
 post_install_message: 
 rdoc_options: []