corn 0.1.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 2794de12eebae473fe6e080c9540e88e47d3358d
-  data.tar.gz: bb75e03506695bc2d02076fe7d77d153c7a0f66c
+  metadata.gz: a683dd6a7151d53b1e5d4f39f2825cb636cb16fb
+  data.tar.gz: 014031992189ffdb40867829d556a13af552c57c
 SHA512: 
-  metadata.gz: 4b7fcdb777001eb9700dc08176afb9f5de994e713a13914c4528e3b69a7a8ec9190304e3ab3857613fb523ddae51c55a1797b2bf6956de66d125442da3dc28d1
-  data.tar.gz: e04a9c049b8ebd6aab24339f926db4d2046648fc48bc9f0d566b03bcc0be04a1fcd1f939facedf0fe25a2fbb6856505c3fda76700a9f263befc3cb6051067bf6
+  metadata.gz: 17bf5360fc21c770b1ea32fc6fba2c1af60ed68371033b6b161946f1be74de4d634788529e91d4d64ade38727d6e64afa555e9343e72f1873a5413c3373227f6
+  data.tar.gz: 96d5a703ba798e4a2bfd4e383a7653d9bf228e282be757c252ca6942cde4f00c5671d5c39ffad30271d59f7b14d8b6dbfeb6360bfb0d28c17862006aaa0e3df1

data/lib/corn.rb

@@ -19,23 +19,21 @@ module Corn
     !!(host && client_id)
   end
 
-  def create_prof(period, output)
-    SamplingProf.new(period).tap do |prof|
+  def create_prof(sampling_interval, output)
+    SamplingProf.new(sampling_interval).tap do |prof|
       prof.output_file = output if output
     end
   end
 
-  def start(output=nil, period=0.1)
-    @prof ||= create_prof(period, output)
+  def start(output=nil, sampling_interval=0.1)
+    @prof ||= create_prof(sampling_interval, output)
     @prof.start
-    @prof_start_at = Time.now
   end
 
   def submit(name)
-    runtime, @prof_start_at = (Time.now - @prof_start_at), nil
     @prof.stop
     if configured?
-      upload(@prof.output_file, name, runtime)
+      upload(@prof.output_file, name)
     else
       log("No CORN_CLIENT_ID or CORN_HOST configured, profiling data is not submitted")
     end
@@ -49,18 +47,21 @@ module Corn
     $stderr.puts msg
   end
 
-  def upload(file, name, runtime)
-    url = URI.parse(submit_url)
+  def upload(file, name)
     File.open(file) do |f|
-      req = Net::HTTP::Post::Multipart.new(url.path,
-                                           "data" => UploadIO.new(f, "text/plain"),
-                                           'client_id' => client_id,
-                                           'name' => name,
-                                           'runtime' => runtime)
-      res = Net::HTTP.start(url.host, url.port) do |http|
-        http.use_ssl = url.scheme == 'https'
-        http.request(req)
-      end
+      post(f, name)
+    end
+  end
+
+  def post(data, name)
+    url = URI.parse(submit_url)
+    req = Net::HTTP::Post::Multipart.new(url.path,
+                                         "data" => UploadIO.new(data, 'text/plain', 'profile.txt'),
+                                         '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

data/lib/corn/rack.rb

@@ -1,13 +1,20 @@
 module Corn
   class Rack
-    def initialize(app, report_name='Corn::Rack')
+    def initialize(app,
+                   report_name="Corn::Rack created at #{Time.now}",
+                   output_interval=nil)
       @app = app
-      @report_name = report_name
+      @prof = SamplingProf.new(0.1, true) do |data|
+        Corn.post(StringIO.new(data), report_name)
+      end
+      if output_interval
+        @prof.output_interval = output_interval
+      end
     end
 
     def call(env)
-      if Corn.configured? && env["QUERY_STRING"] =~ /corn_profiling=true/
-        profile do
+      if Corn.configured?
+        @prof.profile do
           @app.call(env)
         end
       else
@@ -15,12 +22,8 @@ module Corn
       end
     end
 
-    def profile(&block)
-      Corn.start(Rails.root.join('tmp', "corn_rack.tmp.#{Thread.current.object_id}"))
-      yield
-    ensure
-      Corn.submit(@report_name)
+    def terminate
+      @prof.terminate
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: corn
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.3.0
 platform: ruby
 authors: 
   - Xiao Li
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-14 00:00:00 Z
+date: 2014-03-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: multipart-post
@@ -28,7 +28,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: "0.1"
+            version: "0.3"
     type: :runtime
     version_requirements: *id002
 description: |