corn 0.5.7.beta1 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd2ed0bc9b102eca18ed7e80ea7a9313702fc02
-  data.tar.gz: 6ce6d074da698b05112110f83635b497f8453735
+  metadata.gz: 7adcac6cd343ea4ceb786ec24182d90eeb416384
+  data.tar.gz: f94f2cd9f9c2eb685de12fce3473fe93ab1aaebb
 SHA512:
-  metadata.gz: 07ad76f726b438be79b29f51144c913fd1f413abbd221c2c0beff3c9453db7a439441de4080bc4ebb111c330ef5c6c7f727709f8605b0aeca26925f3920eb22e
-  data.tar.gz: 5d216ec62d5c8d3ccc111d7aee67b3740a3b1c4899023479ed725b27fe3855fd6c27afbaa8322d673d321c28d94471aa2590a65592532d190ad96ce84e6311d6
+  metadata.gz: 9c4a2a716cce0a5db01e713129e60023ac5627b1b4c592e1f47e896e9705c38434d7f8100bf8a5b216e073279c93f32e956438158e3a54bb8150c987f481b2ac
+  data.tar.gz: 90ab740aee78df5ffd2068b542bf303d09b1cbe2154f6285ad6e0d3fd0f3e680b1d2d11fd0e6d96acbdff6496fcdcc87886817866728b4c155eec42c1d8b06f4

data/lib/corn.rb

@@ -33,12 +33,9 @@ module Corn
            :rack_middleware => Rack::SlowRequestProfiler,
            :rack_slow_request_profiler => Rack::SlowRequestProfiler,
            :slow_request_threshold => 5,
-           :fast_request_threshold => lambda { [Corn.sampling_interval * 5, Corn.slow_request_threshold.to_f / 5].max },
            :profiling => true,
            :sampling_interval => 0.1,
-           :post_interval => 2,
-           :post_fast_request_interval => 60, #seconds
-           :fast_request_sampling_limit => 1024 * 1024 * 2 #2MB
+           :post_interval => 2
          })
 
   module_function

data/lib/corn/post.rb

@@ -5,12 +5,9 @@ require 'time'
 
 module Corn
   class Post
-    def initialize(interval, sampling_limit, sampling_time)
+    def initialize(interval)
       @queue = Queue.new
       @thread = start_post_thread(interval)
-      @sampling_limit = sampling_limit
-      @sampling_time = sampling_time
-      reset_sampling
     end
 
     def terminate
@@ -27,21 +24,8 @@ module Corn
       Thread.start do
         begin
           loop do
-            d = @queue.pop
-            case d[:action]
-            when :post
-              http_post([d])
-              sleep interval
-            when :sampling
-              @sampling << d
-              if Time.now - @sampling_start > @sampling_time
-                http_post(@sampling.items, :sampling)
-                reset_sampling
-                sleep interval
-              end
-            else
-              Corn.logger.info("Corn: Ignore unknown action: #{d[:action]}")
-            end
+            http_post([@queue.pop])
+            sleep interval
           end
         rescue => e
           Corn.logger.error("Corn post thread stopped by error #{e.message}\n#{e.backtrace.join("\n")}")
@@ -93,11 +77,5 @@ module Corn
     def submit_url
       Corn.submit_url
     end
-
-    private
-    def reset_sampling
-      @sampling = ReservoirSampling.new(@sampling_limit)
-      @sampling_start = Time.now
-    end
   end
 end

data/lib/corn/profiler.rb

@@ -3,9 +3,8 @@ require 'sampling_prof'
 
 module Corn
   class Profiler
-    def initialize(post_interval, post_sampling_limit, post_sampling_time,
-                   sampling_interval)
-      @post = Post.new(post_interval, post_sampling_limit, post_sampling_time)
+    def initialize(post_interval, sampling_interval)
+      @post = Post.new(post_interval)
       @prof = SamplingProf.new(sampling_interval)
       at_exit { terminate }
     end

data/lib/corn/rack/slow_request_profiler.rb

@@ -1,6 +1,5 @@
 require 'thread'
 require 'corn/profiler'
-require 'corn/reservoir_sampling'
 require 'corn/rack/request_env'
 
 module Corn
@@ -8,10 +7,7 @@ module Corn
     class SlowRequestProfiler
       class ProfilingApp
         def initialize(app)
-          @@prof ||= Profiler.new(Corn.post_interval,
-                                  Corn.fast_request_sampling_limit,
-                                  Corn.post_fast_request_interval,
-                                  Corn.sampling_interval)
+          @@prof ||= Profiler.new(Corn.post_interval, Corn.sampling_interval)
           @app = app
 
           Corn.logger.info("Corn sampling interval: #{Corn.sampling_interval}")
@@ -34,17 +30,11 @@ module Corn
         def output_handler(env)
           request_env = RequestEnv.new(env)
           lambda do |data|
-            t = request_env.time
-            if t < fast_request_threshold || t > slow_request_threshold
-              action = t > Corn.slow_request_threshold ? :post : :sampling
-              request_env.to_report.merge(:data => data, :action => action)
+            if request_env.time > slow_request_threshold
+              request_env.to_report.merge(:data => data)
             end
           end
         end
-
-        def fast_request_threshold
-          @frt ||= Corn.fast_request_threshold
-        end
         def slow_request_threshold
           @srt ||= Corn.slow_request_threshold
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corn
 version: !ruby/object:Gem::Version
-  version: 0.5.7.beta1
+  version: 0.5.7
 platform: ruby
 authors:
 - Xiao Li
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sampling_prof
@@ -38,7 +38,6 @@ files:
 - lib/corn/post.rb
 - lib/corn/profiler.rb
 - lib/corn/rack.rb
-- lib/corn/reservoir_sampling.rb
 - lib/corn/rack/request_env.rb
 - lib/corn/rack/slow_request_profiler.rb
 - lib/generators/corn/config/config_generator.rb
@@ -57,9 +56,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9

data/lib/corn/reservoir_sampling.rb

@@ -1,29 +0,0 @@
-module Corn
-  class ReservoirSampling
-    attr_reader :items
-    def initialize(limit)
-      @limit = limit
-      @items = []
-      @size = -1
-      @count = 0
-    end
-
-    def <<(item)
-      @count += 1
-      if @size < 0 && bytesize < @limit
-        items << item
-      else
-        @size = items.size
-        j = rand(@count).to_i
-        if j < @size
-          items[j] = item
-        end
-      end
-    end
-
-    private
-    def bytesize
-      items.map{|d|d[:data].bytesize}.reduce(:+) || 0
-    end
-  end
-end