fluent-plugin-sakuraio 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e951b84bf74baf95b46335ae0fecdfcaa6dc8b
-  data.tar.gz: a5c62c88d8598360920883a91aca441a1c0efd85
+  metadata.gz: dab9eca760e6bbe4e3f98bd61a23aeb36c6eb166
+  data.tar.gz: 5c2031207cbce00792f9fac8c8de6a039b176500
 SHA512:
-  metadata.gz: c41362b2a2e2df281f295ab2113ea9e4812e8ac25f8ae020844974d033ff9d40ef2c0d7914af2709b200eb347137edbd15ba01fa560a7a661f716d22663f34e3
-  data.tar.gz: 2edd95d5b38e1368722c748a4759495801cede38d184298a9e647767db356f2cf47b616099b13638589b8dd8cfee277a225ecdbc6e15103120081542a15d026c
+  metadata.gz: 49a9f00dfa0b299803dd2375c29b73d91e0940fc88d651f667a21afc6126447cbda327d09e84ea7612f9d0dfc8f7f5456c509e6e47f80861fb922983620abdc4
+  data.tar.gz: 9a0521050ddbfcbdd9aaf9fc234631a866f81727ec542cfddf0652165805567ab63c7542cd39cfa0ff3e1ed402242f489110353507a912fa22c03390f005e583

data/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Change Log
+
+## [v0.0.7](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.7) (2017-11-03)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.6...v0.0.7)
+
+**Closed issues:**
+
+- Always invoking EM.run may be harmful [\#5](https://github.com/sakuraio/fluent-plugin-sakuraio/issues/5)
+- Is mandatory url parameter? [\#4](https://github.com/sakuraio/fluent-plugin-sakuraio/issues/4)
+
+**Merged pull requests:**
+
+- Use secret parameter [\#3](https://github.com/sakuraio/fluent-plugin-sakuraio/pull/3) ([okkez](https://github.com/okkez))
+- Fix library path [\#2](https://github.com/sakuraio/fluent-plugin-sakuraio/pull/2) ([okkez](https://github.com/okkez))
+- Set Fluentd dependency [\#1](https://github.com/sakuraio/fluent-plugin-sakuraio/pull/1) ([okkez](https://github.com/okkez))
+
+## [v0.0.6](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.6) (2017-10-31)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.5...v0.0.6)
+
+## [v0.0.5](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.5) (2017-10-30)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.4...v0.0.5)
+
+## [v0.0.4](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.4) (2017-10-30)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.3...v0.0.4)
+
+## [v0.0.3](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.3) (2017-10-30)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.2...v0.0.3)
+
+## [v0.0.2](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.2) (2017-10-30)
+[Full Changelog](https://github.com/sakuraio/fluent-plugin-sakuraio/compare/v0.0.1...v0.0.2)
+
+## [v0.0.1](https://github.com/sakuraio/fluent-plugin-sakuraio/tree/v0.0.1) (2017-10-30)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -37,6 +37,17 @@ gem install 'fluent-plugin-sakuraio'
 
 The details of sakura.io message spec: https://sakura.io/docs/pages/platform-specification/message.html
 
+## Output Configuration
+
+```
+<match **>
+  @type sakuraio
+  url wss://api.sakura.io/ws/v1/xxxxxxxxxxxxxxxxxxxxxxx
+  modules ["uXXXXXXXXXXX"] # array of modules
+  channels {"0": ["key", "i"]} # hash of channels {"channel number": ["key in record", "data type"]}
+</match>
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/fluent-plugin-sakuraio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-sakuraio'
-  spec.version       = '0.0.7'
+  spec.version       = '0.1.0'
   spec.authors       = ['Yuya Kusakabe']
   spec.email         = ['yuya.kusakabe@gmail.com']
 

data/lib/fluent/plugin/in_sakuraio.rb

@@ -14,6 +14,7 @@ module Fluent::Plugin
     def configure(conf)
       super
 
+      @client = Faye::WebSocket::Client.new(@url)
       @time_parser = Fluent::TimeParser.new(nil)
     end
 
@@ -39,12 +40,11 @@ module Fluent::Plugin
 
     def run
       EM.next_tick do
-        client = Faye::WebSocket::Client.new(@url)
-        client.on :open do
+        @client.on :open do
           log.info "sakuraio: starting websocket connection for #{@url}."
         end
 
-        client.on :message do |event|
+        @client.on :message do |event|
           log.debug "sakuraio: received message #{event.data}"
           records = parse(event.data)
           unless records.empty?
@@ -54,12 +54,12 @@ module Fluent::Plugin
           end
         end
 
-        client.on :error do |event|
+        @client.on :error do |event|
           log.warn "sakuraio: #{event.message}"
         end
 
-        client.on :close do
-          client = nil
+        @client.on :close do
+          @client = nil
         end
       end
     end

data/lib/fluent/plugin/out_sakuraio.rb

@@ -0,0 +1,65 @@
+require 'fluent/plugin/output'
+require 'yajl'
+require 'faye/websocket'
+
+module Fluent::Plugin
+  class SakuraIOOutput < Output
+    Fluent::Plugin.register_output('sakuraio', self)
+
+    config_param :url, :string, secret: true
+    config_param :modules, :array, value_type: :string, secret: true
+    # channels {"channel_number": ["key", "type"]}
+    config_param :channels, :hash
+
+    def configure(conf)
+      super
+
+      @client = Faye::WebSocket::Client.new(@url)
+      ensure_reactor_running
+      thread_create(:out_sakuraio, &method(:run))
+    end
+
+    def ensure_reactor_running
+      return if EM.reactor_running?
+      thread_create(:out_sakuraio_reactor) do
+        EM.run
+      end
+    end
+
+    def run
+      EM.next_tick do
+        @client.on :open do
+          log.info "sakuraio: starting websocket connection for #{@url}."
+        end
+
+        @client.on :error do |event|
+          log.warn "sakuraio: #{event.message}"
+        end
+
+        @client.on :close do
+          @client = nil
+        end
+      end
+    end
+
+    def process(_tag, es)
+      es.each do |_time, record|
+        log.debug "sakuraio: process record #{record}"
+        @client.send(encode_record(record))
+      end
+    end
+
+    def encode_record(record)
+      data = []
+      @channels.each do |ch, v|
+        key, type = v
+        data.push('channel' => ch,
+                  'type' => type,
+                  'value' => record[key])
+      end
+      hash = { 'type' => 'channels',
+               'payload' => { 'channels' => data } }
+      Yajl::Encoder.encode(hash)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sakuraio
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuya Kusakabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -151,12 +151,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-sakuraio.gemspec
 - lib/fluent/plugin/in_sakuraio.rb
+- lib/fluent/plugin/out_sakuraio.rb
 homepage: https://github.com/sakuraio/fluent-plugin-sakuraio
 licenses:
 - MIT