corn 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: f6f36171dd4b5964f2fd405ee3d8bb32ec9903dc
-  data.tar.gz: c6a0ae40a7cc39fbe9de79bc94ab1544052e41d8
-SHA512: 
-  metadata.gz: 8ee868d1f6c7ead8146b24d82f5df7d53771ebc50ddefe554483528885c963e472ff2ec01392745f7e6516baf70230c3dc83ad72cac7411b66335f4158b5f06d
-  data.tar.gz: e9509c5b8a8925db14fbb7c6ba634e8acc560519fd15acad8361d1fc5db4b76672fc6917815da342eb3a5f591880f17c142be44d1d9b3cbae84c5a0e8d3df77f
+---
+SHA1:
+  metadata.gz: 6b6b345c60ef516a140324b6b3dd8eb3a88eee84
+  data.tar.gz: 0f6a5d0a10a48c6435b3b3bd3066e97d0fbe67fb
+SHA512:
+  metadata.gz: 75be86a19958acc4d0052f291ce091f4ac98fdd9690c62756eb65c78b3f818eb2839a0ad7fe896830731c41ca69688874b519b071389cfd497d59f1ae0f912fd
+  data.tar.gz: 0490385b78fca2ab7cc5aac0dcc07bf70eed6c9787f3b2515de0f16eff8bb994274c29872da3028564441b1729c1a2fc5875c942b28ae70156502b0f2d0b4a12

data/lib/corn.rb

@@ -3,10 +3,15 @@ require 'sampling_prof'
 require 'net/http'
 require 'net/https'
 require 'corn/rack'
+require 'logger'
 
 module Corn
   module_function
 
+  def rack_slow_request_profiler
+    Rack::SlowRequestProfiler
+  end
+
   def host
     ENV['CORN_HOST']
   end
@@ -19,39 +24,15 @@ module Corn
     !!(host && client_id)
   end
 
-  def profiler(report_name, sampling_interval=0.1, output_interval=nil)
-    if !configured?
-      log("No CORN_CLIENT_ID or CORN_HOST configured, profiling data is not submitted")
-      return
-    end
-    SamplingProf.new(sampling_interval, true) do |data|
-      post(data, report_name)
-    end.tap do |prof|
-      if output_interval
-        prof.output_interval = output_interval
-      end
-    end
-  end
-
   def submit_url
     File.join(host, 'profile_data')
   end
 
-  def log(msg)
-    $stderr.puts msg
+  def logger=(l)
+    @logger = l
   end
 
-  def post(data, name)
-    url = URI.parse(submit_url)
-    req = Net::HTTP::Post.new(url.path)
-    req.set_form_data("data" => data, 'client_id' => client_id, 'name' => name)
-    res = Net::HTTP.start(url.host, url.port) do |http|
-      http.use_ssl = url.scheme == 'https'
-      http.request(req)
-    end
-    log("Corn report submitted to #{submit_url}")
-  rescue Exception => e
-    log("post to #{submit_url} failed: #{e.message}")
-    log(e.backtrace.join("\n"))
+  def logger
+    @logger ||= Logger.new(STDOUT)
   end
 end

data/lib/corn/post.rb

@@ -0,0 +1,53 @@
+require 'thread'
+
+module Corn
+  class Post
+    def initialize
+      @queue = Queue.new
+      @thread = start_post_thread
+    end
+
+    def terminate
+      @thread.terminate rescue nil
+    end
+
+    def start_post_thread
+      Thread.start do
+        begin
+          loop do
+            http_post(*@queue.pop)
+            sleep 1
+          end
+        rescue => e
+          log("Corn post thread stopped by error #{e.message}\n#{e.backtrace.join("\n")}")
+        end
+      end
+    end
+
+    def enqueue(data, name)
+      @queue << [data, name]
+    end
+
+    def http_post(data, name)
+      url = URI.parse(submit_url)
+      req = Net::HTTP::Post.new(url.path)
+      req.set_form_data("data" => data, 'client_id' => Corn.client_id, 'name' => name)
+      res = Net::HTTP.start(url.host, url.port) do |http|
+        http.use_ssl = url.scheme == 'https'
+        http.request(req)
+      end
+      log("Corn report submitted to #{submit_url}")
+    rescue Exception => e
+      log("post to #{submit_url} failed: #{e.message}")
+      log(e.backtrace.join("\n"))
+    end
+
+    def submit_url
+      Corn.submit_url
+    end
+
+    def log(msg)
+      Corn.logger.info msg
+    end
+  end
+end

data/lib/corn/rack.rb

@@ -1,26 +1 @@
-module Corn
-  class Rack
-    def initialize(app,
-                   report_name="Corn::Rack created at #{Time.now}",
-                   sampling_interval=0.1,
-                   output_interval=nil)
-      @app = app
-      @prof = Corn.profiler(report_name, sampling_interval, output_interval)
-      at_exit { terminate }
-    end
-
-    def call(env)
-      if Corn.configured?
-        @prof.profile do
-          @app.call(env)
-        end
-      else
-        @app.call(env)
-      end
-    end
-
-    def terminate
-      @prof.terminate
-    end
-  end
-end
+require 'corn/rack/slow_request_profiler'

data/lib/corn/rack/slow_request_profiler.rb

@@ -0,0 +1,34 @@
+require 'sampling_prof'
+require 'corn/post'
+
+module Corn
+  module Rack
+    class SlowRequestProfiler
+      def initialize(app,
+                     slow_request=5,
+                     sampling_interval=0.1)
+        @app = app
+        @post = Post.new
+        @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)
+          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) }
+      end
+
+      def terminate
+        @prof.terminate rescue nil
+        @post.terminate
+      end
+    end
+  end
+end

metadata

@@ -1,66 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: corn
-version: !ruby/object:Gem::Version 
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
 platform: ruby
-authors: 
-  - Xiao Li
-autorequire: 
+authors:
+- Xiao Li
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2014-04-16 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.3"
-    type: :runtime
-    version_requirements: *id001
+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
 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/rack.rb
+files:
+- README.md
+- lib/corn.rb
+- lib/corn/post.rb
+- lib/corn/rack.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: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - *id002
+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'
 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: []
-