garbageman 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/garbageman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]

data/lib/garbageman/collector.rb

@@ -98,6 +98,7 @@ module GarbageMan
 
     def select_next_server
       return unless @will_select_next_server
+      return unless @request_count >= Config.num_request_before_selecting_next_server
       @will_select_next_server = false
 
       Config.thin_config['servers'].times do |i|
@@ -164,8 +165,16 @@ module GarbageMan
       config && config['gc'] && config['gc']['server'] && config['gc']['server'] == server_index && config['gc']['status'] == 'next_server'
     end
 
+    def forcing_gc?
+      File.exists?(Config.enable_gc_file)
+    end
+ 
+    def not_forcing_gc?
+      ! forcing_gc?
+    end
+
     def can_disable?
-      Config.thin_config.has_key?('socket') && not_queuing? && min_running_servers?
+      Config.thin_config.has_key?('socket') && not_queuing? && not_forcing_gc? && enough_running_servers?
     end
 
     def num_running_servers
@@ -177,7 +186,7 @@ module GarbageMan
     end
 
     # make sure there are 3 or more servers running before disabling gc
-    def min_running_servers?
+    def enough_running_servers?
       num_servers >= Config.min_servers_to_disable_gc && num_running_servers >= Config.min_servers_to_disable_gc
     end
 

data/lib/garbageman/config.rb

@@ -18,7 +18,12 @@ module GarbageMan
     @@thin_config = nil
     def self.thin_config; @@thin_config ||= YAML.load_file("./config/thin.yml"); end
 
-    def self.num_request_before_collecting; 10; end
-    def self.min_servers_to_disable_gc; 3; end
+    @@enable_gc_file = "./data/enable_gc"
+    def self.enable_gc_file; @@enable_gc_file; end
+
+    def self.num_request_before_collecting; 20; end
+    # 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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3623494067155397432
+      hash: 2990565593376099137
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: