garbageman 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/garbageman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
-  s.date = "2013-06-13"
+  s.date = "2013-06-19"
   s.description = "Disable GC while processing requests.  By using nginx upstream health checks to garbage collect when no one is there."
   s.email = "doug@sessionm.com"
   s.extra_rdoc_files = [

data/lib/garbageman/collector.rb

@@ -14,7 +14,7 @@ module GarbageMan
     include Status
 
     attr_accessor :request_count, :will_collect, :will_select_next_server, :show_gc_times
-    attr_reader :fiber_poll
+    attr_reader :fiber_poll, :last_gc_finished_at
 
     def initialize
       @show_gc_times = true
@@ -66,7 +66,8 @@ module GarbageMan
       starts = Time.now
       GC.enable
       GC.start
-      diff = (Time.now - starts) * 1000
+      @last_gc_finished_at = Time.now
+      diff = (@last_gc_finished_at - starts) * 1000
       info "GC took #{'%.2f' % diff}ms for #{@request_count} requests" if @show_gc_times
       write_gc_yaml server_index, NEXT_SERVER
 
@@ -174,8 +175,16 @@ module GarbageMan
       ! forcing_gc?
     end
 
+    def uses_sockets?
+      Config.thin_config.has_key?('socket')
+    end
+
     def can_disable?
-      Config.thin_config.has_key?('socket') && not_queuing? && not_forcing_gc? && enough_running_servers?
+      uses_sockets? &&
+        not_queuing? &&
+        have_not_waited_too_long_to_gc? &&
+        not_forcing_gc? &&
+        enough_running_servers?
     end
 
     def num_running_servers
@@ -194,6 +203,15 @@ module GarbageMan
     def socket_file(index)
       Config.thin_config['socket'].sub '.sock', ".#{index}.sock"
     end
+
+    def waited_too_long_to_gc?
+      return false unless @last_gc_finished_at
+      (Time.now - @last_gc_finished_at) >= Config.max_time_without_gc
+    end
+
+    def have_not_waited_too_long_to_gc?
+      ! waited_too_long_to_gc?
+    end
   end
 end
 

data/lib/garbageman/config.rb

@@ -25,5 +25,7 @@ module GarbageMan
     # absolutely make sure we are in the pool again before selecting next server
     def self.num_request_before_selecting_next_server; 10; end
     def self.min_servers_to_disable_gc; 2; end
+    # if we have not GC in 20 seconds turn back on GC
+    def self.max_time_without_gc; 20; end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 533476601492460822
+      hash: -2750624905344639858
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: