fluent-plugin-amqp 0.7.1 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/fluent/plugin/in_amqp.rb +5 -3
  2. data/lib/fluent/plugin/out_amqp.rb +5 -3
  3. metadata +56 -37
  4. checksums.yaml +0 -7
data/lib/fluent/plugin/in_amqp.rb CHANGED
@@ -19,6 +19,7 @@ module Fluent
19
19
  config_param :tag, :string, :default => "hunter.amqp"
20
20
 
21
21
  config_param :host, :string, :default => nil
22
+ config_param :hosts, :array, :default => nil
22
23
  config_param :user, :string, :default => "guest"
23
24
  config_param :pass, :string, :default => "guest", :secret => true
24
25
  config_param :vhost, :string, :default => "/"
@@ -63,8 +64,8 @@ module Fluent
63
64
  end
64
65
 
65
66
  @conf = conf
66
- unless @host && @queue
67
- raise ConfigError, "'host' and 'queue' must be all specified."
67
+ unless (@host || @hosts) && @queue
68
+ raise ConfigError, "'host(s)' and 'queue' must be all specified."
68
69
  end
69
70
  check_tls_configuration
70
71
  end
@@ -140,8 +141,9 @@ module Fluent
140
141
  end
141
142
 
142
143
  def get_connection_options()
144
+ hosts = @hosts ||= Array.new(@host)
143
145
  opts = {
144
- :host => @host, :port => @port, :vhost => @vhost,
146
+ :hosts => hosts, :port => @port, :vhost => @vhost,
145
147
  :pass => @pass, :user => @user, :ssl => @ssl,
146
148
  :verify_ssl => @verify_ssl, :heartbeat => @heartbeat,
147
149
  :tls => @tls,
data/lib/fluent/plugin/out_amqp.rb CHANGED
@@ -9,6 +9,7 @@ module Fluent
9
9
  attr_accessor :connection
10
10
 
11
11
  config_param :host, :string, :default => nil
12
+ config_param :hosts, :array, :default => nil
12
13
  config_param :user, :string, :default => "guest"
13
14
  config_param :pass, :string, :default => "guest", :secret => true
14
15
  config_param :vhost, :string, :default => "/"
@@ -40,8 +41,8 @@ module Fluent
40
41
  def configure(conf)
41
42
  super
42
43
  @conf = conf
43
- unless @host
44
- raise ConfigError, "'host' must be specified."
44
+ unless @host || @hosts
45
+ raise ConfigError, "'host' or 'hosts' must be specified."
45
46
  end
46
47
  unless @key || @tag_key
47
48
  raise ConfigError, "Either 'key' or 'tag_key' must be set."
@@ -111,8 +112,9 @@ module Fluent
111
112
  end
112
113
 
113
114
  def get_connection_options()
115
+ hosts = @hosts ||= Array.new(@host)
114
116
  opts = {
115
- :host => @host, :port => @port, :vhost => @vhost,
117
+ :hosts => hosts, :port => @port, :vhost => @vhost,
116
118
  :pass => @pass, :user => @user, :ssl => @ssl,
117
119
  :verify_ssl => @verify_ssl, :heartbeat => @heartbeat,
118
120
  :tls => @tls,
metadata CHANGED
@@ -1,12 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-amqp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.8.0
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Hiromi Ishii
8
9
  - Team Giraffi
9
10
  - HiganWorks LLC
11
+ - Toby Jackson
10
12
  autorequire:
11
13
  bindir: bin
12
14
  cert_chain: []
@@ -15,113 +17,129 @@ dependencies:
15
17
  - !ruby/object:Gem::Dependency
16
18
  name: fluentd
17
19
  requirement: !ruby/object:Gem::Requirement
20
+ none: false
18
21
  requirements:
19
- - - "~>"
22
+ - - ~>
20
23
  - !ruby/object:Gem::Version
21
24
  version: 0.12.0
22
25
  type: :runtime
23
26
  prerelease: false
24
27
  version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
25
29
  requirements:
26
- - - "~>"
30
+ - - ~>
27
31
  - !ruby/object:Gem::Version
28
32
  version: 0.12.0
33
+ - !ruby/object:Gem::Dependency
34
+ name: amq-protocol
35
+ requirement: !ruby/object:Gem::Requirement
36
+ none: false
37
+ requirements:
38
+ - - <
39
+ - !ruby/object:Gem::Version
40
+ version: '2'
41
+ type: :runtime
42
+ prerelease: false
43
+ version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
45
+ requirements:
46
+ - - <
47
+ - !ruby/object:Gem::Version
48
+ version: '2'
29
49
  - !ruby/object:Gem::Dependency
30
50
  name: bunny
31
51
  requirement: !ruby/object:Gem::Requirement
52
+ none: false
32
53
  requirements:
33
- - - "~>"
54
+ - - <
34
55
  - !ruby/object:Gem::Version
35
- version: '2.2'
56
+ version: '2'
36
57
  type: :runtime
37
58
  prerelease: false
38
59
  version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
39
61
  requirements:
40
- - - "~>"
62
+ - - <
41
63
  - !ruby/object:Gem::Version
42
- version: '2.2'
64
+ version: '2'
43
65
  - !ruby/object:Gem::Dependency
44
66
  name: shoulda
45
67
  requirement: !ruby/object:Gem::Requirement
68
+ none: false
46
69
  requirements:
47
- - - ">="
70
+ - - ! '>='
48
71
  - !ruby/object:Gem::Version
49
72
  version: '0'
50
73
  type: :development
51
74
  prerelease: false
52
75
  version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
53
77
  requirements:
54
- - - ">="
78
+ - - ! '>='
55
79
  - !ruby/object:Gem::Version
56
80
  version: '0'
57
81
  - !ruby/object:Gem::Dependency
58
82
  name: rake
59
83
  requirement: !ruby/object:Gem::Requirement
84
+ none: false
60
85
  requirements:
61
- - - ">="
86
+ - - ! '>='
62
87
  - !ruby/object:Gem::Version
63
88
  version: '0'
64
89
  type: :development
65
90
  prerelease: false
66
91
  version_requirements: !ruby/object:Gem::Requirement
92
+ none: false
67
93
  requirements:
68
- - - ">="
94
+ - - ! '>='
69
95
  - !ruby/object:Gem::Version
70
96
  version: '0'
71
97
  - !ruby/object:Gem::Dependency
72
98
  name: minitest
73
99
  requirement: !ruby/object:Gem::Requirement
100
+ none: false
74
101
  requirements:
75
- - - "<"
102
+ - - <
76
103
  - !ruby/object:Gem::Version
77
104
  version: 5.0.0
78
105
  type: :development
79
106
  prerelease: false
80
107
  version_requirements: !ruby/object:Gem::Requirement
108
+ none: false
81
109
  requirements:
82
- - - "<"
110
+ - - <
83
111
  - !ruby/object:Gem::Version
84
112
  version: 5.0.0
85
113
  - !ruby/object:Gem::Dependency
86
114
  name: test-unit
87
115
  requirement: !ruby/object:Gem::Requirement
116
+ none: false
88
117
  requirements:
89
- - - ">="
118
+ - - ! '>='
90
119
  - !ruby/object:Gem::Version
91
120
  version: 3.1.0
92
121
  type: :development
93
122
  prerelease: false
94
123
  version_requirements: !ruby/object:Gem::Requirement
124
+ none: false
95
125
  requirements:
96
- - - ">="
126
+ - - ! '>='
97
127
  - !ruby/object:Gem::Version
98
128
  version: 3.1.0
99
- - !ruby/object:Gem::Dependency
100
- name: bunny-mock
101
- requirement: !ruby/object:Gem::Requirement
102
- requirements:
103
- - - ">="
104
- - !ruby/object:Gem::Version
105
- version: '1.0'
106
- type: :development
107
- prerelease: false
108
- version_requirements: !ruby/object:Gem::Requirement
109
- requirements:
110
- - - ">="
111
- - !ruby/object:Gem::Version
112
- version: '1.0'
113
129
  - !ruby/object:Gem::Dependency
114
130
  name: simplecov
115
131
  requirement: !ruby/object:Gem::Requirement
132
+ none: false
116
133
  requirements:
117
- - - ">="
134
+ - - ! '>='
118
135
  - !ruby/object:Gem::Version
119
136
  version: '0.10'
120
137
  type: :development
121
138
  prerelease: false
122
139
  version_requirements: !ruby/object:Gem::Requirement
140
+ none: false
123
141
  requirements:
124
- - - ">="
142
+ - - ! '>='
125
143
  - !ruby/object:Gem::Version
126
144
  version: '0.10'
127
145
  description: AMQP input/output plugin for fluentd
@@ -131,31 +149,32 @@ extensions: []
131
149
  extra_rdoc_files:
132
150
  - LICENSE.txt
133
151
  files:
134
- - LICENSE.txt
135
152
  - lib/fluent/plugin/in_amqp.rb
136
153
  - lib/fluent/plugin/out_amqp.rb
154
+ - LICENSE.txt
137
155
  homepage: http://github.com/giraffi/fluent-plugin-amqp
138
156
  licenses:
139
157
  - Apache License, Version 2.0
140
- metadata: {}
141
158
  post_install_message:
142
159
  rdoc_options: []
143
160
  require_paths:
144
161
  - lib
145
162
  required_ruby_version: !ruby/object:Gem::Requirement
163
+ none: false
146
164
  requirements:
147
- - - ">="
165
+ - - ! '>='
148
166
  - !ruby/object:Gem::Version
149
167
  version: '0'
150
168
  required_rubygems_version: !ruby/object:Gem::Requirement
169
+ none: false
151
170
  requirements:
152
- - - ">="
171
+ - - ! '>='
153
172
  - !ruby/object:Gem::Version
154
173
  version: '0'
155
174
  requirements: []
156
175
  rubyforge_project:
157
- rubygems_version: 2.4.8
176
+ rubygems_version: 1.8.24
158
177
  signing_key:
159
- specification_version: 4
178
+ specification_version: 3
160
179
  summary: AMQP input/output plugin or fluentd
161
180
  test_files: []
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: e2faee36d9db937fb190935e620e3b39a3dc226d
4
- data.tar.gz: 5070a58c8427cb20c1a100105573036fc0d8688f
5
- SHA512:
6
- metadata.gz: d07705f1da8b0618ca41029c5a01a1b453ced2347a829b4e544581d0fb5878f7c383f323911c2be4e30519678faf254123b06073d9b8c7b90e85b7d8a0a962c8
7
- data.tar.gz: 2927771afd59c19287d934f5b560845afb57bc705c4799668f581b81ec6d25d907d5b4c6d3f1377dcfb64fb12f12e4fcc522df5005d79bd3e23fe6e39a0dcac7