fluent-plugin-mqtt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b384df168f46e48df47f54da9b54c286a4044834
-  data.tar.gz: f4b54348b86aec4045955e45f74285cea598fe0b
+  metadata.gz: d4e453c77b000aeef76dbe664b9fb67d63a6e532
+  data.tar.gz: f22a3f8159fdfc1bc4571619406534292a082652
 SHA512:
-  metadata.gz: e1a175591615e3ea8a589609c5c87e26b9dce99a11856493bf7173b9683a4e9a50bd1ea324eeb2d15479b532e5bb12169a7a37b0ab276f49754f042cf6bd26ae
-  data.tar.gz: 9e639c9c02de3a748a9baac0479d1519c5c3e88b410e81ed575c799ee98a2c918c9c01ad40ba1b61600fd49b1d700461df70b0e7a9766a04a91f15e34784f3f7
+  metadata.gz: d38f63aaabf190906296242b259ad742c9f43d659abda789dda94007d34271caa68852a2976626207c1285ca8d060a7682effe8251977bdb0ca301d958e9ec56
+  data.tar.gz: 972613c5cd9484810ba8757577748781a9659404dba58459e572183a22986dc682e39482b45b85ed6266737b2bcfef1cb66ce726881765cbf4d54076cdbb3cf1

data/fluent-plugin-mqtt.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mqtt"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Yuuna Kurita"]
   spec.email         = ["yuuna.m@gmail.com"]
   spec.summary       = %q{fluentd input plugin for mqtt server}

data/lib/fluent/plugin/in_mqtt.rb

@@ -22,7 +22,7 @@ module Fluent
     end
 
     def start
-      $log.debug "start mqtt"
+      $log.debug "start mqtt #{@bind}"
       @connect = MQTT::Client.connect({remote_host: @bind, remote_port: @port})
       @connect.subscribe(@topic)
 
@@ -36,7 +36,14 @@ module Fluent
     end
 
     def emit topic, message , time = Fluent::Engine.now
-          Fluent::Engine.emit(topic, time , message )
+      if message.class == Array
+        message.each do |data|
+          $log.debug "#{topic}: #{data}"
+          Fluent::Engine.emit(topic , time , data)
+        end
+      else
+        Fluent::Engine.emit(topic , time , message)
+      end
     end
 
     def json_parse message

data/test/plugin/test_in_mqtt.rb

@@ -1,9 +1,17 @@
 require 'helper'
 
 class Fluent::MqttInput 
-  def emit topic, message, time = Fluent::Engine.now
-    Fluent::Engine.emit(topic, message["t"], message)
+  def emit topic, message , time = Fluent::Engine.now
+    if message.class == Array
+      message.each do |data|
+        $log.debug "#{topic}: #{data}"
+        Fluent::Engine.emit(topic, message["t"], data)
+      end
+    else
+      Fluent::Engine.emit(topic, message["t"], message)
+    end
   end
+
 end
 
 class MqttInputTest < Test::Unit::TestCase
@@ -41,12 +49,17 @@ class MqttInputTest < Test::Unit::TestCase
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i    
     d.expect_emit "tag1", time, {"t" => time, "v" => {"a"=>1}}
     d.expect_emit "tag2", time, {"t" => time, "v" => {"a"=>2}}
+    d.expect_emit "tag3", time, {"t" => time, "v" => {"a"=>31}}
+    d.expect_emit "tag3", time, {"t" => time, "v" => {"a"=>32}}
+
     d.run do
       d.expected_emits.each {|tag,time,record|
         send_data tag, time, record
       }
+      send_data "tag3", time , [{"t" => time, "v" => {"a"=>31}} , {"t" => time, "v" => {"a"=>32}}] 
       sleep 0.5
     end
+
   end
 
   def send_data tag, time, record

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuuna Kurita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler