corn 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: f58264f89af6bd995da6d701af22b1f9f1d5b539
-  data.tar.gz: 451d4a5e348cc5070d9204a1ebc47072bce29cd3
+  metadata.gz: f6f36171dd4b5964f2fd405ee3d8bb32ec9903dc
+  data.tar.gz: c6a0ae40a7cc39fbe9de79bc94ab1544052e41d8
 SHA512: 
-  metadata.gz: d97a873cd81bdee21506be418be6bfa42378573654731bef4f2f5e4aae6973ab8e32b3d5c6b87d9db67f9267e4aa911f7f9bfc05428094537efa00aaa91745e8
-  data.tar.gz: 62dfcc8c8ef95f232c359f603e6be304b977f019f00d001119d58526e2edf27a780a835a393ea622cca0cc7eb60af420bc34db34e6c65a4df0c828efc595414e
+  metadata.gz: 8ee868d1f6c7ead8146b24d82f5df7d53771ebc50ddefe554483528885c963e472ff2ec01392745f7e6516baf70230c3dc83ad72cac7411b66335f4158b5f06d
+  data.tar.gz: e9509c5b8a8925db14fbb7c6ba634e8acc560519fd15acad8361d1fc5db4b76672fc6917815da342eb3a5f591880f17c142be44d1d9b3cbae84c5a0e8d3df77f

data/lib/corn.rb

@@ -1,7 +1,7 @@
+require 'rubygems'
 require 'sampling_prof'
 require 'net/http'
 require 'net/https'
-require 'net/http/post/multipart'
 require 'corn/rack'
 
 module Corn
@@ -19,23 +19,17 @@ module Corn
     !!(host && client_id)
   end
 
-  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, sampling_interval=0.1)
-    @prof ||= create_prof(sampling_interval, output)
-    @prof.start
-  end
-
-  def submit(name)
-    @prof.stop
-    if configured?
-      upload(@prof.output_file, name)
-    else
+  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
 
@@ -47,25 +41,17 @@ module Corn
     $stderr.puts msg
   end
 
-  def upload(file, name)
-    File.open(file) do |f|
-      post(UploadIO.new(f, 'text/plain', File.basename(f.path)), name)
-    end
-  end
-
   def post(data, name)
     url = URI.parse(submit_url)
-    req = Net::HTTP::Post::Multipart.new(url.path,
-                                         "data" => data,
-                                         'client_id' => client_id,
-                                         'name' => name)
+    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("upload #{file} to #{submit_url} failed: #{e.message}")
+    log("post to #{submit_url} failed: #{e.message}")
     log(e.backtrace.join("\n"))
   end
 end

data/lib/corn/rack.rb

@@ -2,14 +2,10 @@ 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 = SamplingProf.new(0.1, true) do |data|
-        Corn.post(data, report_name)
-      end
-      if output_interval
-        @prof.output_interval = output_interval
-      end
+      @prof = Corn.profiler(report_name, sampling_interval, output_interval)
       at_exit { terminate }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: corn
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
   - Xiao Li
@@ -9,28 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-04 00:00:00 Z
+date: 2014-04-16 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: multipart-post
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "2.0"
-    type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: sampling_prof
     prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0.3"
     type: :runtime
-    version_requirements: *id002
+    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.
 
@@ -58,13 +48,13 @@ require_paths:
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - &id003 
+    - &id002 
       - ">="
       - !ruby/object:Gem::Version 
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - *id003
+    - *id002
 requirements: []
 
 rubyforge_project: