fluent-plugin-amqp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZmMGY0OWViZGNkMjRhMDBhODAwZDBhNmI3OWQxNGU1ZDQ0YmFlZA==
+    NDYxODgwMGQyNmM5ZWE5ZDQyMzA4MTkwMDhjMDllZjFhZjRkODdmMA==
   data.tar.gz: !binary |-
-    ZDc0YTQ1Yzk5ZTIzZThjYzI0MGQzMzVjOTZjNjgzZDAxOTMxZjFiMQ==
+    NzJmNTIxYTMxYzRkOTM3ZGM5Zjk4OWJkYWQwZTJjMzljNmJlNTYzZA==
 SHA512:
   metadata.gz: !binary |-
-    YjNkN2M4NjZiYjM2MmZjNmVlZTEzNmM2YTQxYzk1NmM4OTdmMjgzNGRkYjkx
-    N2JmMTUzMWU0MDg5ZjNkOWI0MjJlNjczZjZlOGU0ZmMyZWRhMmMzZmY1YWM0
-    OTdlM2U5OTIxYmRjYmRiNWZhOWNlZDYyNzIwMzg2ZDQ4NTE0ZWM=
+    NWUyNzFiMzlmZmZmNjAyNGYwZDBmZjkxYjE5NmVlNDM5NzY3Njc4ZTU1NDUy
+    OTY1MjM2NTk1NmRlNGM4NTAyOTlkOTBiZTVmMTlkMjZjYzNmZWY2ZWNiM2Iw
+    MmQ5MDE3NWM1MDYzNWI4NjNmMDhiYzZjZmM4ZmE0MzJhNGNlMmQ=
   data.tar.gz: !binary |-
-    NmExOTMwOTM5ODg1MWUxNjUxYWIwOWE4MWFjZGRlM2JkZDZlZjY2NmI1NDc4
-    MzhmMWFlZGUyMmI0MTVmZTZjMWFhNjQ0YTBlMTgxNDgzYTQ3MzRiMzlkNWRm
-    OTFiZmJmODljZjNkMmYzMDcxODEwNDc3ZWY4YTgxOWY2ZGVjYzQ=
+    NTBhMTQxYTJhYWMzNmI4OWNkZGE5Mjc1Y2ZhNjhjODYzYjI2Mjk5MGQyZDgz
+    YWM4ZmVmMzk3ZTRjNjBkMWI5YTExYTE4YzBkYzQyZGQ1NzIzMzAzYjJkMzU3
+    OTg4MTQ3NzNjZGM4Zjc5MTk4NjBjMWNmODE3ZGY5Yjg0YmYxZTc=

data/lib/fluent/plugin/in_amqp.rb

@@ -21,13 +21,19 @@ module Fluent
 
     def initialize
       require 'bunny'
-      require "json" if @payload_format == "json"
-
       super
     end
 
     def configure(conf)
+      conf['format'] ||= conf['payload_format'] # legacy
+
       super
+
+      parser = TextParser.new
+      if parser.configure(conf, false)
+        @parser = parser
+      end
+
       @conf = conf
       unless @host && @queue
         raise ConfigError, "'host' and 'queue' must be all specified."
@@ -60,19 +66,20 @@ module Fluent
 
     private
     def parse_payload(msg)
-      ret = { 'payload' => msg }
-
-      begin
-        case @payload_format
-        when "json"
-          ret = JSON.parse(msg)
+      if @parser
+        parsed = nil
+        @parser.parse msg do |_, payload|
+          if payload.nil?
+            log.warn "failed to parse #{msg}"
+            parsed = { "message" => msg }
+          else
+            parsed = payload
+          end
         end
-      rescue => e
-        # should raises a error to ovserver?
-        $log.error "parse payload error: #{e}, payload: #{msg}"
+        parsed
+      else
+        { "message" => msg }
       end
-
-      ret
     end
   end # class AMQPInput
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiromi Ishii
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -54,6 +54,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: AMQP input/output plugin for fluentd
 email: sawanoboriyu@higanworks.com
 executables: []
@@ -86,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AMQP input/output plugin or fluentd