corn 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 1ff8db881c521ceb58ac042cdcb8a707768da281
-  data.tar.gz: ec0048ff2da0f637e4f1cb9a7cdf53e9941f1ca9
-SHA512:
-  metadata.gz: 505b222b6998f772a4def63b12f431ea0ea7c5de50042dbb7812a98a195b3ab1bee980bd11e81a57f7b1f5f8baf336fa78495e21860bc26b49726db172d329aa
-  data.tar.gz: 7429d8ae6c5355d82ef16c0d64d1a2b8c003f3a1f05948b4a15187ce249a097974a163e5575d66ddbe419a9945d205f861b65756c7319d712da22898c77c3733
+--- 
+SHA1: 
+  metadata.gz: 07429dba6e4008f4bcb1eff01f06684408a24a36
+  data.tar.gz: ef59195398f1c04a798ec93ba534fbe8894f6df0
+SHA512: 
+  metadata.gz: 5408556f99f1bc880d2843348044a4b8d281569d0d5b558e4cf57ea2c63fc2babdf86e792acf126a73043a4c9e04f3b816a95664b413674fd280b21fd1024c75
+  data.tar.gz: 7c21f7658fd447eae5c46fd42ab5bff705a536571051f59ac92c33d6b65b2e0311344ef1e018fc9ea0e9386ea1768f03e67626c3ca2c3d461bec33d158416df0

data/lib/corn/post.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'thread'
+require 'time'
 
 module Corn
   class Post
@@ -26,14 +27,17 @@ module Corn
       end
     end
 
-    def enqueue(data, name)
-      @queue << [data, name]
+    def enqueue(*args)
+      @queue << args
     end
 
-    def http_post(data, name)
+    def http_post(data, name, start_time)
       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)
+      req.set_form_data("data" => data,
+                        'client_id' => Corn.client_id,
+                        'name' => name,
+                        'start_time' => start_time.iso8601)
 
       http = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'

data/lib/corn/rack/request_env.rb

@@ -0,0 +1,37 @@
+module Corn
+  module Rack
+    class RequestEnv
+      def initialize(threshold)
+        @threshold = threshold
+      end
+
+      def record(env, &block)
+        Thread.current['corn_path_info'] = env['PATH_INFO']
+        Thread.current['corn_http_host'] = env['HTTP_HOST']
+        Thread.current['corn_start_time'] = Time.now
+        yield
+      ensure
+        Thread.current['corn_path_info'] = nil
+        Thread.current['corn_http_host'] = nil
+        Thread.current['corn_start_time'] = nil
+      end
+
+      def start_time
+        Thread.current['corn_start_time']
+      end
+
+      def time
+        Time.now - start_time
+      end
+
+      def slow_request?
+        time > @threshold
+      end
+
+      def report_name
+        File.join(*[Thread.current['corn_http_host'],
+                    Thread.current['corn_path_info']].compact)
+      end
+    end
+  end
+end

data/lib/corn/rack/slow_request_profiler.rb

@@ -1,28 +1,30 @@
 require 'corn/post'
+require 'corn/rack/request_env'
 require 'sampling_prof'
 
 module Corn
   module Rack
     class SlowRequestProfiler
       def initialize(app,
-                     slow_request=5,
+                     slow_request_threshold=5,
                      sampling_interval=0.1)
         @app = app
         @post = Post.new
+        @request_env = RequestEnv.new(slow_request_threshold)
         @prof = SamplingProf.new(sampling_interval) do |data|
-          t = Thread.current
-          if (Time.now - t['corn_start_time']) > slow_request
-            name = [t['corn_start_time'], t['corn_path_info']].join(',')
-            @post.enqueue(data, name)
+          if @request_env.slow_request?
+            @post.enqueue(data,
+                          @request_env.report_name,
+                          @request_env.start_time)
           end
         end
         at_exit { terminate }
       end
 
       def call(env)
-        Thread.current['corn_path_info'] = env['PATH_INFO']
-        Thread.current['corn_start_time'] = Time.now
-        @prof.profile { @app.call(env) }
+        @request_env.record(env) do
+          @prof.profile { @app.call(env) }
+        end
       end
 
       def terminate

metadata

@@ -1,65 +1,70 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: corn
-version: !ruby/object:Gem::Version
-  version: 0.4.4
+version: !ruby/object:Gem::Version 
+  version: 0.4.5
 platform: ruby
-authors:
-- Xiao Li
-autorequire:
+authors: 
+  - Xiao Li
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sampling_prof
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  prerelease: false
-  type: :runtime
+
+date: 2014-06-18 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: sampling_prof
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.4"
+    type: :runtime
+    version_requirements: *id001
 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.
-email:
-- swing1979@gmail.com
+
+email: 
+  - swing1979@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- README.md
-- lib/corn.rb
-- lib/corn/config.rb
-- lib/corn/post.rb
-- lib/corn/rack.rb
-- lib/corn/rack/slow_request_profiler.rb
+
+files: 
+  - README.md
+  - lib/corn.rb
+  - lib/corn/config.rb
+  - lib/corn/post.rb
+  - lib/corn/rack.rb
+  - lib/corn/rack/request_env.rb
+  - lib/corn/rack/slow_request_profiler.rb
 homepage: https://github.com/xli/corn
-licenses:
-- MIT
+licenses: 
+  - MIT
 metadata: {}
-post_install_message:
+
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - *id002
 requirements: []
-rubyforge_project:
+
+rubyforge_project: 
 rubygems_version: 2.1.9
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Corn submits profiling data to Corn server.
 test_files: []
+