fluent-plugin-sakuraio 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d785f10e2637af608fbcdede42f849673e44ed
-  data.tar.gz: 5c1e19248f892d875d661d514ec7c6f6d32fd907
+  metadata.gz: d6e951b84bf74baf95b46335ae0fecdfcaa6dc8b
+  data.tar.gz: a5c62c88d8598360920883a91aca441a1c0efd85
 SHA512:
-  metadata.gz: e0da44bfc9559554995af08fbb17a0faa043ad0e6fde60cf69ff0eaa320ea645af417c26338727e064874c46f0718ebf60ba1f5bda9c691761dab99848019bb2
-  data.tar.gz: a2d3fbf84996ae8952889b53a6414f1c39cde82cc458a5f7cf4b0130b21adc269e9b314179c77c1fef72d26e29dfffa1c18770e2d1f3e345d7cb2c3b23233826
+  metadata.gz: c41362b2a2e2df281f295ab2113ea9e4812e8ac25f8ae020844974d033ff9d40ef2c0d7914af2709b200eb347137edbd15ba01fa560a7a661f716d22663f34e3
+  data.tar.gz: 2edd95d5b38e1368722c748a4759495801cede38d184298a9e647767db356f2cf47b616099b13638589b8dd8cfee277a225ecdbc6e15103120081542a15d026c

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.6'
+  spec.version       = '0.0.7'
   spec.authors       = ['Yuya Kusakabe']
   spec.email         = ['yuya.kusakabe@gmail.com']
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'eventmachine'
   spec.add_runtime_dependency 'faye-websocket'
-  spec.add_runtime_dependency 'fluentd'
+  spec.add_runtime_dependency 'fluentd', '>= 0.14', '< 2'
   spec.add_runtime_dependency 'yajl-ruby'
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/fluent/plugin/in_sakuraio.rb

@@ -1,4 +1,4 @@
-require 'fluent/input'
+require 'fluent/plugin/input'
 require 'yajl'
 require 'faye/websocket'
 require 'eventmachine'
@@ -9,7 +9,7 @@ module Fluent::Plugin
 
     helpers :thread
 
-    config_param :url, :string, default: nil
+    config_param :url, :string, secret: true
 
     def configure(conf)
       super
@@ -20,17 +20,25 @@ module Fluent::Plugin
     def start
       super
 
-      thread_create(:in_sakuraio) do
-        run
+      ensure_reactor_running
+      thread_create(:in_sakuraio, &method(:run))
+    end
+
+    def ensure_reactor_running
+      return if EM.reactor_running?
+      thread_create(:in_sakuraio_reactor) do
+        EM.run
       end
     end
 
     def shutdown
+      EM.stop if EM.reactor_running?
+
       super
     end
 
     def run
-      EM.run do
+      EM.next_tick do
         client = Faye::WebSocket::Client.new(@url)
         client.on :open do
           log.info "sakuraio: starting websocket connection for #{@url}."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sakuraio
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yuya Kusakabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement