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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d1c2fa9da92102d0517324f87482aa9f552d30
-  data.tar.gz: a6fbdb01ba0d0fa8f597f32fab8038e0d8388a2a
+  metadata.gz: 073b844f677ea653c53e0ab6dba3acd74bed13b3
+  data.tar.gz: a3772a54e28b746268facbef28785ee247fb0339
 SHA512:
-  metadata.gz: 33359191371e974322482d504d22949834197b89ec128d0e60ba58b152a7210ea32db47d25c9eb6b35cc515b6eea2b3854d5847bd409f8cb1702843a17df9e05
-  data.tar.gz: be387dc660ed8b9241294df6474386ab1ffce4de81ca73ec0f12d409f5c4137736f5f58066944a222aff5c205879462546482542096f8a4f0a865856582272c2
+  metadata.gz: 679b03443566dee67ac0d7b211071bcfba1b10a36369b9031bc906eb201d09de796a71b634ef7a8d541379a6562aad4635bcd3900f127320d73d73810e0f61a6
+  data.tar.gz: 50b3432e8542aa08a2cd5fda521a9def447a79f62672591d3fd98926546db135e56b2c9ec3ba7e9afa597bb45bbfdec270873dfcb0b073fd3c794a3af9c0bca5

data/lib/fluent/plugin/in_mongo_slow_query.rb

@@ -12,7 +12,7 @@ module Fluent
         def configure(conf)
             unless conf.has_key?("format")
                 #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/'
+                conf["format"] = '/(?<time>.*) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((query: (?<query>{.+}) update: {.*})|(query: (?<query>{.+}))) .* (?<ms>\d+)ms/'
                 $log.warn "load default format: ", conf["format"]
             end
 
@@ -61,6 +61,14 @@ module Fluent
                 ns = parent.empty? ? key : (parent + '.' + key)
                 if val.class == Hash
                     ns_array += extract_query_prototype(val, ns)
+                elsif val.class == Array
+                    val.each do |item|
+                        if item.class == Hash
+                            ns_array += extract_query_prototype(item, ns)
+                        else
+                            ns_array << ns + '.' + item
+                        end
+                    end
                 else
                     ns_array << ns
                 end
@@ -71,12 +79,24 @@ module Fluent
         # get query prototype
         def get_query_prototype(query)
             begin
-                prototype = extract_query_prototype(JSON.parse(eval(query).to_json))
+                prototype = extract_query_prototype(JSON.parse(to_json(query)))
                 return '{ ' + prototype.join(', ') + ' }'
             rescue
                 $log.error $!.to_s
                 return query
             end
         end
+
+        # convert query to JSON
+        def to_json(query)
+            res = query.gsub(/( [^ ]+?: )/) {|fieldname| fieldname_format(fieldname)}
+            return res
+        end
+
+        # format fieldname in query
+        # e.g.: { id: 1 } => { "id": 1 }
+        def fieldname_format(fieldname)
+            return ' "%s": ' % fieldname.strip.chomp(':')
+        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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - caosiyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies: []
 description: fluent plugin for mongo slow query
 email: csy3228@gmail.com