fluent-plugin-mqtt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d93e842a532198c75c7520cedb5417db36252a
-  data.tar.gz: b12b3618be94456a9307fc4d816e0e44b0255858
+  metadata.gz: 3fd8e3a50f128c2eed1ad45698e0717d60f1af41
+  data.tar.gz: 17a9e5405a4d7d72e14773c7e29d43cd596a1b9f
 SHA512:
-  metadata.gz: e65f421d83d3b588430f378b5b87d18af278162ec42b21fb0d53a4ccbc8aa2d34b1f7f0c88f3acbaf0d3a8b2d62f983e54ae6e5a8ebd234fc96a44d2c388f4b5
-  data.tar.gz: f3e3113d8cadafe1d4347f0f8bc41d982a18fd1375df7aea0f7059beaf41e9d89f8baa571074f2511359c087b8dcbc5a8d1215ae91a631c9f8d9f8d0cedf7dc2
+  metadata.gz: a182d419e6e18de083194728813d0d7c7fb41a680499947e037a050a5a1c7723e81daa8adb60f286eaf841a36ee72d9b7d58d625fc2becd9c7984cc93a263ccc
+  data.tar.gz: f4424914b01c172b33cfd7b68036ff9b20184ed0c24fabcdddc8a8a516f9839e13e9efe3c94563398539402ac36cf01be547a54d67fb2e7f78142f702ca66cd4

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.4"
+  spec.version       = "0.0.5"
   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

@@ -43,12 +43,12 @@ module Fluent
     def start
       $log.debug "start mqtt #{@bind}"
       opts = {host: @bind,
-              port: @port,
-              username: @username,
-              password: @password}
+              port: @port}
+      opts[:username] =  @username if @username
+      opts[:password] = @password if @password
       opts[:ssl] = @ssl if @ssl
       opts[:ca_file] = @ca if @ca
-      opts[:crt_file] = @crt if @crt
+      opts[:cert_file] = @crt if @crt
       opts[:key_file] = @key if @key
       @connect = MQTT::Client.connect(opts)
       @connect.subscribe(@topic)

data/lib/fluent/plugin/out_mqtt.rb

@@ -0,0 +1,91 @@
+module Fluent
+  class OutMqtt < BufferedOutput
+    Plugin.register_output('mqtt', self)
+
+    include Fluent::SetTagKeyMixin
+    config_set_default :include_tag_key, false
+    
+    include Fluent::SetTimeKeyMixin
+    config_set_default :include_time_key, true
+
+    
+    config_param :port, :integer, :default => 1883
+    config_param :bind, :string, :default => '127.0.0.1'
+    config_param :topic, :string, :default => 'td-agent'
+    config_param :format, :string, :default => 'none'
+    config_param :username, :string, :default => nil
+    config_param :password, :string, :default => nil
+    config_param :ssl, :bool, :default => nil
+    config_param :ca, :string, :default => nil
+    config_param :key, :string, :default => nil
+    config_param :cert, :string, :default => nil
+
+    require 'mqtt'
+
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
+
+    def initialize
+      super
+      require 'msgpack'
+
+      @clients = {}
+      @connection_options = {}
+      @collection_options = {:capped => false}
+    end
+
+    def configure(conf)
+      super
+      @bind ||= conf['bind']
+      @topic ||= conf['topic'] 
+      @port ||= conf['port']      
+    end
+
+    def start
+      #check buffer_size
+      @buffer.buffer_chunk_limit = available_buffer_chunk_limit
+
+      $log.debug "start mqtt #{@bind}"
+      opts = {host: @bind,
+              port: @port}
+      opts[:username] =  @username if @username
+      opts[:password] = @password if @password
+      opts[:ssl] = @ssl if @ssl
+      opts[:ca_file] = @ca if @ca
+      opts[:cert_file] = @crt if @crt
+      opts[:key_file] = @key if @key
+      @connect = MQTT::Client.connect(opts)
+      super
+    end
+
+    def shutdown
+      @connect.disconnect
+      super
+    end
+
+    def format(tag, time, record)
+      [tag, time, record].to_msgpack
+    end
+
+    def write(chunk)
+      $log.debug "write"
+      chunk.msgpack_each { |tag, time, record|
+        @connect.publish(tag, record , retain=true)
+      }
+    end
+
+    private
+    # Following limits are heuristic. BSON is sometimes bigger than MessagePack and JSON.
+    LIMIT_MQTT = 2 * 1024  # 2048kb
+
+    def available_buffer_chunk_limit
+      if @buffer.buffer_chunk_limit > LIMIT_MQTT
+        log.warn ":buffer_chunk_limit(#{@buffer.buffer_chunk_limit}) is large. Reset :buffer_chunk_limit with #{LIMIT_MQTT}"
+        LIMIT_MQTT
+      else
+        @buffer.buffer_chunk_limit
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yuuna Kurita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - fluent-plugin-mqtt.gemspec
 - lib/fluent/plugin/in_mqtt.rb
+- lib/fluent/plugin/out_mqtt.rb
 - test/helper.rb
 - test/plugin/test_in_mqtt.rb
 homepage: http://github.com/yuuna/fluent-plugin-mqtt
@@ -130,10 +131,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: fluentd input plugin for mqtt server
 test_files:
 - test/helper.rb
 - test/plugin/test_in_mqtt.rb
+has_rdoc: