garbageman 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/garbageman.gemspec

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

data/lib/garbageman/collector.rb

@@ -13,7 +13,7 @@ module GarbageMan
 
     include Status
 
-    attr_accessor :request_count, :will_collect
+    attr_accessor :request_count, :will_collect, :will_select_next_server
     attr_reader :fiber_poll
 
     def initialize
@@ -33,8 +33,11 @@ module GarbageMan
       end
 
       if select_next_server?
-        EM.next_tick do
+        if @will_select_next_server
           select_next_server
+        else
+          # wait until we receive another request before selecting the next server
+          @will_select_next_server = true
         end
         return true
       end
@@ -109,6 +112,9 @@ module GarbageMan
     end
 
     def select_next_server
+      return unless @will_select_next_server
+      @will_select_next_server = false
+
       Config.thin_config['servers'].times do |i|
         next_server_index = (server_index + i + 1) % num_servers
         file = socket_file next_server_index
@@ -123,6 +129,7 @@ module GarbageMan
     def reset
       @request_count = 0
       @will_collect = false
+      @will_select_next_server = false
     end
 
     def busy?

data/lib/garbageman/config.rb

@@ -19,6 +19,6 @@ module GarbageMan
     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
+    def self.min_servers_to_disable_gc; 2; end
   end
 end

data/lib/garbageman/rack/middleware.rb

@@ -15,6 +15,7 @@ module GarbageMan
         else
           # this is not 100% preventable with nginx, nginx will still send requests while waiting for the health check response
           GarbageMan::Collector.instance.logger.debug("still receiving traffic even though I'm waiting to GC") if GarbageMan::Collector.instance.will_collect
+          GarbageMan::Collector.instance.select_next_server if GarbageMan::Collector::instance.will_select_next_server
           @app.call(env)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 934671664126256271
+      hash: 1250881766983274641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: