fluent-plugin-mongo-slow-query 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa827020993c3b9d101768f7cfd245287516ff1
-  data.tar.gz: c0345c46f856136c08952af620bc1fad0fbddaf3
+  metadata.gz: b1d1c2fa9da92102d0517324f87482aa9f552d30
+  data.tar.gz: a6fbdb01ba0d0fa8f597f32fab8038e0d8388a2a
 SHA512:
-  metadata.gz: 37f7f5c04f34e6e93ddfb287d2092a9c6cb9f63350583c60e7153cd9b569175239140534e076448531bd3ef0e7c763b7820b9595a6447746c092ee061ea52a73
-  data.tar.gz: a7495ba4f6ce4a0a21672847164482b191360f0f97538962b68d2361220f2f221a4c0ea71a06ebfbbec404151a0aee182a765115a231e2bce599bfbf7ade2962
+  metadata.gz: 33359191371e974322482d504d22949834197b89ec128d0e60ba58b152a7210ea32db47d25c9eb6b35cc515b6eea2b3854d5847bd409f8cb1702843a17df9e05
+  data.tar.gz: be387dc660ed8b9241294df6474386ab1ffce4de81ca73ec0f12d409f5c4137736f5f58066944a222aff5c205879462546482542096f8a4f0a865856582272c2

data/lib/fluent/plugin/in_mongo_slow_query.rb

@@ -3,7 +3,7 @@ require 'json'
 module Fluent
     class MongoDBSlowQueryInput < TailInput
         # First, register the plugin. NAME is the name of this plugin
-        #   # and identifies the plugin in the configuration file.
+        # and identifies the plugin in the configuration file.
         Plugin.register_input('mongo_slow_query', self)
 
         # This method is called before starting.
@@ -11,7 +11,8 @@ module Fluent
         # If the configuration is invalid, raise Fluent::ConfigError.
         def configure(conf)
             unless conf.has_key?("format")
-                conf["format"] = '/(?<time>[^ ]+ [^ ]+ [^ ]+ [^ ]+) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) (query: (?<query>{.+}) update: (?<update>{.*}))|(query: (?<query>{.+})) .* (?<cost>\d+)ms/'
+                #conf["format"] = '/(?<time>[^ ]+ [^ ]+ [^ ]+ [^ ]+) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((query: (?<query>{.+}) update: (?<update>{.*}))|(query: (?<query>{.+}))) .* (?<ms>\d+)ms/'
+                conf["format"] = '/(?<time>[^ ]+ [^ ]+ [^ ]+ [^ ]+) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((query: (?<query>{.+}) update: {.*})|(query: (?<query>{.+}))) .* (?<ms>\d+)ms/'
                 $log.warn "load default format: ", conf["format"]
             end
 
@@ -33,9 +34,9 @@ module Fluent
                         if record.has_key?("query")
                             record["query"] = get_query_prototype(record["query"])
                         end
-                        if record.has_key?("update")
-                            record["update"] = get_query_prototype(record["update"])
-                        end
+                        #if record.has_key?("update")
+                        #    record["update"] = get_query_prototype(record["update"])
+                        #end
                         es.add(time, record)
                     end
                 rescue
@@ -53,7 +54,7 @@ module Fluent
             end
         end
 
-        # exrtact query prototype recursively
+        # extract query prototype recursively
         def extract_query_prototype(query_json_obj, parent='')
             ns_array = []
             query_json_obj.each do |key, val|
@@ -69,8 +70,13 @@ module Fluent
 
         # get query prototype
         def get_query_prototype(query)
-            prototype = extract_query_prototype(JSON.parse(eval(query).to_json))
-            return '{ ' + prototype.join(', ') + ' }'
+            begin
+                prototype = extract_query_prototype(JSON.parse(eval(query).to_json))
+                return '{ ' + prototype.join(', ') + ' }'
+            rescue
+                $log.error $!.to_s
+                return query
+            end
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo-slow-query
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - caosiyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies: []
 description: fluent plugin for mongo slow query
 email: csy3228@gmail.com