fluent-plugin-amqp 0.2.0 → 0.3.0

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.
Files changed (3) hide show
  1. checksums.yaml +8 -8
  2. data/lib/fluent/plugin/in_amqp.rb +20 -13
  3. metadata +31 -3
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZWZmMGY0OWViZGNkMjRhMDBhODAwZDBhNmI3OWQxNGU1ZDQ0YmFlZA==
4
+ NDYxODgwMGQyNmM5ZWE5ZDQyMzA4MTkwMDhjMDllZjFhZjRkODdmMA==
5
5
  data.tar.gz: !binary |-
6
- ZDc0YTQ1Yzk5ZTIzZThjYzI0MGQzMzVjOTZjNjgzZDAxOTMxZjFiMQ==
6
+ NzJmNTIxYTMxYzRkOTM3ZGM5Zjk4OWJkYWQwZTJjMzljNmJlNTYzZA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YjNkN2M4NjZiYjM2MmZjNmVlZTEzNmM2YTQxYzk1NmM4OTdmMjgzNGRkYjkx
10
- N2JmMTUzMWU0MDg5ZjNkOWI0MjJlNjczZjZlOGU0ZmMyZWRhMmMzZmY1YWM0
11
- OTdlM2U5OTIxYmRjYmRiNWZhOWNlZDYyNzIwMzg2ZDQ4NTE0ZWM=
9
+ NWUyNzFiMzlmZmZmNjAyNGYwZDBmZjkxYjE5NmVlNDM5NzY3Njc4ZTU1NDUy
10
+ OTY1MjM2NTk1NmRlNGM4NTAyOTlkOTBiZTVmMTlkMjZjYzNmZWY2ZWNiM2Iw
11
+ MmQ5MDE3NWM1MDYzNWI4NjNmMDhiYzZjZmM4ZmE0MzJhNGNlMmQ=
12
12
  data.tar.gz: !binary |-
13
- NmExOTMwOTM5ODg1MWUxNjUxYWIwOWE4MWFjZGRlM2JkZDZlZjY2NmI1NDc4
14
- MzhmMWFlZGUyMmI0MTVmZTZjMWFhNjQ0YTBlMTgxNDgzYTQ3MzRiMzlkNWRm
15
- OTFiZmJmODljZjNkMmYzMDcxODEwNDc3ZWY4YTgxOWY2ZGVjYzQ=
13
+ NTBhMTQxYTJhYWMzNmI4OWNkZGE5Mjc1Y2ZhNjhjODYzYjI2Mjk5MGQyZDgz
14
+ YWM4ZmVmMzk3ZTRjNjBkMWI5YTExYTE4YzBkYzQyZGQ1NzIzMzAzYjJkMzU3
15
+ OTg4MTQ3NzNjZGM4Zjc5MTk4NjBjMWNmODE3ZGY5Yjg0YmYxZTc=
@@ -21,13 +21,19 @@ module Fluent
21
21
 
22
22
  def initialize
23
23
  require 'bunny'
24
- require "json" if @payload_format == "json"
25
-
26
24
  super
27
25
  end
28
26
 
29
27
  def configure(conf)
28
+ conf['format'] ||= conf['payload_format'] # legacy
29
+
30
30
  super
31
+
32
+ parser = TextParser.new
33
+ if parser.configure(conf, false)
34
+ @parser = parser
35
+ end
36
+
31
37
  @conf = conf
32
38
  unless @host && @queue
33
39
  raise ConfigError, "'host' and 'queue' must be all specified."
@@ -60,19 +66,20 @@ module Fluent
60
66
 
61
67
  private
62
68
  def parse_payload(msg)
63
- ret = { 'payload' => msg }
64
-
65
- begin
66
- case @payload_format
67
- when "json"
68
- ret = JSON.parse(msg)
69
+ if @parser
70
+ parsed = nil
71
+ @parser.parse msg do |_, payload|
72
+ if payload.nil?
73
+ log.warn "failed to parse #{msg}"
74
+ parsed = { "message" => msg }
75
+ else
76
+ parsed = payload
77
+ end
69
78
  end
70
- rescue => e
71
- # should raises a error to ovserver?
72
- $log.error "parse payload error: #{e}, payload: #{msg}"
79
+ parsed
80
+ else
81
+ { "message" => msg }
73
82
  end
74
-
75
- ret
76
83
  end
77
84
  end # class AMQPInput
78
85
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-amqp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Hiromi Ishii
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-03-30 00:00:00.000000000 Z
13
+ date: 2014-06-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: fluentd
@@ -54,6 +54,34 @@ dependencies:
54
54
  - - ! '>='
55
55
  - !ruby/object:Gem::Version
56
56
  version: '0'
57
+ - !ruby/object:Gem::Dependency
58
+ name: rake
59
+ requirement: !ruby/object:Gem::Requirement
60
+ requirements:
61
+ - - ! '>='
62
+ - !ruby/object:Gem::Version
63
+ version: '0'
64
+ type: :development
65
+ prerelease: false
66
+ version_requirements: !ruby/object:Gem::Requirement
67
+ requirements:
68
+ - - ! '>='
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
71
+ - !ruby/object:Gem::Dependency
72
+ name: minitest
73
+ requirement: !ruby/object:Gem::Requirement
74
+ requirements:
75
+ - - <
76
+ - !ruby/object:Gem::Version
77
+ version: 5.0.0
78
+ type: :development
79
+ prerelease: false
80
+ version_requirements: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - <
83
+ - !ruby/object:Gem::Version
84
+ version: 5.0.0
57
85
  description: AMQP input/output plugin for fluentd
58
86
  email: sawanoboriyu@higanworks.com
59
87
  executables: []
@@ -86,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
86
114
  version: '0'
87
115
  requirements: []
88
116
  rubyforge_project:
89
- rubygems_version: 2.2.0
117
+ rubygems_version: 2.2.2
90
118
  signing_key:
91
119
  specification_version: 4
92
120
  summary: AMQP input/output plugin or fluentd