fluent-plugin-sakuraio 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c2d785f10e2637af608fbcdede42f849673e44ed
4
- data.tar.gz: 5c1e19248f892d875d661d514ec7c6f6d32fd907
3
+ metadata.gz: d6e951b84bf74baf95b46335ae0fecdfcaa6dc8b
4
+ data.tar.gz: a5c62c88d8598360920883a91aca441a1c0efd85
5
5
  SHA512:
6
- metadata.gz: e0da44bfc9559554995af08fbb17a0faa043ad0e6fde60cf69ff0eaa320ea645af417c26338727e064874c46f0718ebf60ba1f5bda9c691761dab99848019bb2
7
- data.tar.gz: a2d3fbf84996ae8952889b53a6414f1c39cde82cc458a5f7cf4b0130b21adc269e9b314179c77c1fef72d26e29dfffa1c18770e2d1f3e345d7cb2c3b23233826
6
+ metadata.gz: c41362b2a2e2df281f295ab2113ea9e4812e8ac25f8ae020844974d033ff9d40ef2c0d7914af2709b200eb347137edbd15ba01fa560a7a661f716d22663f34e3
7
+ data.tar.gz: 2edd95d5b38e1368722c748a4759495801cede38d184298a9e647767db356f2cf47b616099b13638589b8dd8cfee277a225ecdbc6e15103120081542a15d026c
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = 'fluent-plugin-sakuraio'
7
- spec.version = '0.0.6'
7
+ spec.version = '0.0.7'
8
8
  spec.authors = ['Yuya Kusakabe']
9
9
  spec.email = ['yuya.kusakabe@gmail.com']
10
10
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
24
24
 
25
25
  spec.add_runtime_dependency 'eventmachine'
26
26
  spec.add_runtime_dependency 'faye-websocket'
27
- spec.add_runtime_dependency 'fluentd'
27
+ spec.add_runtime_dependency 'fluentd', '>= 0.14', '< 2'
28
28
  spec.add_runtime_dependency 'yajl-ruby'
29
29
  spec.add_development_dependency 'bundler', '~> 1.13'
30
30
  spec.add_development_dependency 'rake', '~> 10.0'
@@ -1,4 +1,4 @@
1
- require 'fluent/input'
1
+ require 'fluent/plugin/input'
2
2
  require 'yajl'
3
3
  require 'faye/websocket'
4
4
  require 'eventmachine'
@@ -9,7 +9,7 @@ module Fluent::Plugin
9
9
 
10
10
  helpers :thread
11
11
 
12
- config_param :url, :string, default: nil
12
+ config_param :url, :string, secret: true
13
13
 
14
14
  def configure(conf)
15
15
  super
@@ -20,17 +20,25 @@ module Fluent::Plugin
20
20
  def start
21
21
  super
22
22
 
23
- thread_create(:in_sakuraio) do
24
- run
23
+ ensure_reactor_running
24
+ thread_create(:in_sakuraio, &method(:run))
25
+ end
26
+
27
+ def ensure_reactor_running
28
+ return if EM.reactor_running?
29
+ thread_create(:in_sakuraio_reactor) do
30
+ EM.run
25
31
  end
26
32
  end
27
33
 
28
34
  def shutdown
35
+ EM.stop if EM.reactor_running?
36
+
29
37
  super
30
38
  end
31
39
 
32
40
  def run
33
- EM.run do
41
+ EM.next_tick do
34
42
  client = Faye::WebSocket::Client.new(@url)
35
43
  client.on :open do
36
44
  log.info "sakuraio: starting websocket connection for #{@url}."
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-sakuraio
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuya Kusakabe
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-10-31 00:00:00.000000000 Z
11
+ date: 2017-11-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eventmachine
@@ -44,14 +44,20 @@ dependencies:
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '0.14'
48
+ - - "<"
49
+ - !ruby/object:Gem::Version
50
+ version: '2'
48
51
  type: :runtime
49
52
  prerelease: false
50
53
  version_requirements: !ruby/object:Gem::Requirement
51
54
  requirements:
52
55
  - - ">="
53
56
  - !ruby/object:Gem::Version
54
- version: '0'
57
+ version: '0.14'
58
+ - - "<"
59
+ - !ruby/object:Gem::Version
60
+ version: '2'
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: yajl-ruby
57
63
  requirement: !ruby/object:Gem::Requirement