corn 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44550a060755050d6930b2921ba78abb6abe6553
-  data.tar.gz: 964e84445c59fe3631c4a96c163c1dae2e3aaad0
+  metadata.gz: e4be49268a392f4c4cbdaedf31da0808ac05329e
+  data.tar.gz: 645775af9946dcefb266f85f3bcc3da4ea572735
 SHA512:
-  metadata.gz: 213d49a2eff2d13f557b46e66bed4a9eea5492f508e29f4488a677d2a2b3bd3dc60267e6ddef0ef52d1459abebb74f329cf949152d673486161c5b231d3bf83e
-  data.tar.gz: c390d9e3b98b03e562a1867dcee8a406ba7fc5f45e5b1d4dac3c537dc87283bdd40c836d0fc9f6f8264453b20e97ddf831288245af53fd1ecd682cc45237033b
+  metadata.gz: dc4055efcb92c7c0b14faefdced0800786bfd6804a3bca82466507e60578638fa95f03deb9dfe6bb480a8069b5fb022025dba771d8dce2791cc5cc1c4316e7b9
+  data.tar.gz: 48b103523e4a1f684524ae625c9dab66600eae78927463411b7eb748a54ee76adb82f0459ab925d5b2ce7603c44b6547671994d488ebb272d77f20413138aa8a

data/lib/corn/post.rb

@@ -11,7 +11,7 @@ module Corn
     end
 
     def terminate
-      @thread.terminate rescue nil
+      @thread.terminate
     end
 
     def start_post_thread
@@ -31,13 +31,10 @@ module Corn
       @queue << args
     end
 
-    def http_post(data, name, start_time)
+    def http_post(data)
       uri = URI.parse(submit_url)
       req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data("data" => data,
-                        'client_id' => Corn.client_id,
-                        'name' => name,
-                        'start_time' => start_time.iso8601)
+      req.set_form_data(data.merge('client_id' => Corn.client_id))
 
       http = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'

data/lib/corn/rack/request_env.rb

@@ -1,25 +1,24 @@
 module Corn
   module Rack
     class RequestEnv
-      attr_reader :start_time
-      def initialize(env, threshold)
-        @path_info = env['PATH_INFO']
-        @http_host = env['HTTP_HOST']
-        @threshold = threshold
-        @start_time = Time.now
+      def initialize(env, start_time=Time.now)
+        @env = [:path_info, :http_host, :query_string].inject({}) do |memo, k|
+          v = env[k.to_s.upcase]
+          if v.nil? || v.empty?
+            memo
+          else
+            memo.merge(k => v)
+          end
+        end
+        @env.merge!(:start_time => start_time)
       end
 
       def time
-        Time.now - start_time
+        Time.now - @env[:start_time]
       end
 
-      def slow_request?
-        time > @threshold
-      end
-
-      def report_name
-        File.join(*[@http_host,
-                    @path_info].compact)
+      def to_h
+        @env.dup
       end
     end
   end

data/lib/corn/rack/slow_request_profiler.rb

@@ -5,34 +5,45 @@ require 'sampling_prof'
 module Corn
   module Rack
     class SlowRequestProfiler
-      def initialize(app,
-                     slow_request_threshold=5,
-                     sampling_interval=0.1)
-        @app = app
-        @slow_request_threshold = slow_request_threshold
-        @post = Post.new
-        @prof = SamplingProf.new(sampling_interval)
-        at_exit { terminate }
+      class ProfilingApp
+        def initialize(app, slow_request_threshold=5, sampling_interval=0.1)
+          @app = app
+          @slow_request_threshold = slow_request_threshold
+          @sampling_interval = sampling_interval
+          @post = Post.new
+          @prof = SamplingProf.new(@sampling_interval)
+          at_exit { terminate }
+        end
+
+        def call(env)
+          @prof.profile(output_handler(env)) { @app.call(env) }
+        end
+
+        def terminate
+          @prof.terminate rescue nil
+          @post.terminate rescue nil
+        end
+
+        def output_handler(env)
+          request_env = RequestEnv.new(env)
+          lambda do |data|
+            if request_env.time > @slow_request_threshold
+              @post.enqueue(request_env.to_h.merge("data" => data))
+            end
+          end
+        end
       end
 
-      def call(env)
-        @prof.profile(output_handler(env)) { @app.call(env) }
+      def initialize(app, *args)
+        @app = Corn.configured? ? ProfilingApp.new(app, *args) : app
       end
 
-      def terminate
-        @prof.terminate rescue nil
-        @post.terminate
+      def call(env)
+        @app.call(env)
       end
 
-      def output_handler(env)
-        request_env = RequestEnv.new(env, @slow_request_threshold)
-        lambda do |data|
-          if request_env.slow_request?
-            @post.enqueue(data,
-                          request_env.report_name,
-                          request_env.start_time)
-          end
-        end
+      def terminate
+        @app.terminate if @app.respond_to?(:terminate)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corn
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Xiao Li
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sampling_prof
@@ -25,7 +25,7 @@ dependencies:
   prerelease: false
   type: :runtime
 description: |
-  Corn collects your application's profiling data by sampling_prof gem, and submits the result to server, so that you can merge multiple server's profiling data and do analysis together.
+  Corn collects your application's profiling data by sampling_prof gem, and submits the result to Corn server for analysis.
 email:
 - swing1979@gmail.com
 executables: []