fluent-plugin-werkzeug-profiler 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d88f53035956160f4255509118afc6e52b40872
-  data.tar.gz: da5bd8332bb05e7f2d927ae08492a13f30ec4614
+  metadata.gz: ba8a708d8a7a06a3434405c7e77cbaa6d780c559
+  data.tar.gz: 1fde09e5c3eade17545b63b0ef8c38751a18ced6
 SHA512:
-  metadata.gz: 93bcde63025e9687664e2a39d05689f85371af4446998560da19f357dba8b56cebefb5b46b4f73df46da50a7ad73313a2d983b52ec15c0712bec51875a05e64c
-  data.tar.gz: 4315d7a0e9abc2ae591dfcc4c3235d25f49e408b59b39fb0d231c8f0a813cf38120dbf7fbd3c09afb8b6416ab6417efe4253a6698e64c2dc3e82c61b008a1e11
+  metadata.gz: d457048ad51aafda8231654efc58e3785759a7fa12dd0093f63f583cebce92dd1437035b1b4b13588964f44345fb186792a749608d47e4eed98fda12b79e0b65
+  data.tar.gz: a5f268da4cb554bdbddfe9848f7ef01addaf36836cbdf873d4992aab523a7a025a2afecfea0e3a88bf1c0da416132e0865c5b8e482a0eea261b053217d9e3c5a

data/README.md

@@ -50,7 +50,6 @@ $ gem install fluent-plugin-werkzeug-profiler
   type werkzeug_profiler
   path path/to/werkzeug.log
   tag werkzeug.webserver
-  time_format %d-%b-%Y:%H:%M:%S
 </source>
 ```
 

data/fluent-plugin-werkzeug-profiler.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-werkzeug-profiler"
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
   gem.authors       = ["Kenta MORI"]
   gem.email         = ["zoncoen@gmail.com"]
   gem.description   = %q{Fluent input plugin for Werkzeug WSGI application profiler statistics.}

data/lib/fluent/plugin/in_werkzeug_profiler.rb

@@ -3,12 +3,9 @@ module Fluent
   class WerkzeugProfilerInput < TailInput
     Plugin.register_input('werkzeug_profiler', self)
 
-    # get time format from config
-    config_param :time_format, :string, :default => '%d/%b/%Y:%H:%M:%S %z'
-
     # override
     def configure_parser(conf)
-      @parser = WerkzeugProfilerParser.new(@time_format)
+      @parser = WerkzeugProfilerParser.new
     end
 
     # override
@@ -33,12 +30,11 @@ module Fluent
     end
 
     class WerkzeugProfilerParser
-      def initialize(time_format)
-        @time_format = time_format
+      def initialize()
         @keys = ['uri', 'tot_ncalls', 'prim_ncalls', 'tottime', 'tot_percall', 'cumtime', 'cum_percall', 'filename:lineno(function)']
         @record_size = @keys.length - 2
-        @path = 'path'
-        @time = 'time'
+        @path = nil
+        @time = nil
       end
 
       def parse(values)
@@ -50,25 +46,32 @@ module Fluent
 
       def divide(lines)
         records = []
-        # remove empty lines
-        lines = lines.join('').gsub(/\n\n/, "\n").split("\n")
 
         for line in lines do
+          # remove empty lines
+          if line == "\n"
+            next
+          end
+
           if line.start_with?('-')
             @path = nil
+            @time = nil
             next
           end
 
           if line.start_with?('PATH:')
             path = line.split(nil)[1]
             @path = path[1..path.length-2]
-            @time = Time.now.strftime(@time_format)
+            @time = Time.now.to_i
             next
           end
 
-          if line.strip.split(nil)[1] == 'function' || line.strip.start_with?('ncalls', 'Ordered', 'List')
+
+          if @path == nil || @time == nil
+            next
+          elsif line.split(nil)[1] == 'function' || line.strip.start_with?('ncalls', 'Ordered', 'List')
             next
-          elsif @path != nil
+          else
             values = line.split(nil)
             # divide ncalls
             ncalls = values[0].split('/')
@@ -86,7 +89,7 @@ module Fluent
         end
 
         # return records as array
-        records
+        return records
       end
     end
   end

data/test/plugin/test_in_werkzeug_profiler.rb

@@ -16,7 +16,6 @@ class WerkzeugProfilerInputTest < Test::Unit::TestCase
 
   CONFIG = %[
     path #{TMP_DIR}/werkzeug-profiler-test.txt
-    time_format %d-%b-%Y:%H:%M:%S
     tag test
   ]
 
@@ -27,7 +26,7 @@ class WerkzeugProfilerInputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver
     assert_equal ["#{TMP_DIR}/werkzeug-profiler-test.txt"], d.instance.paths
-    assert_equal "%d-%b-%Y:%H:%M:%S", d.instance.time_format
+    assert_equal 'test', d.instance.tag
   end
 
   def test_emit
@@ -55,6 +54,7 @@ class WerkzeugProfilerInputTest < Test::Unit::TestCase
         f.puts ""
         f.puts "--------------------------------------------------------------------------------"
         f.puts ""
+        f.puts "127.0.0.1 - - [08/Nov/2013 13:16:56] \"GET / HTTP/1.1\" 200 -"
       }
       sleep 1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-werkzeug-profiler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kenta MORI