garbageman 0.1.5 → 0.1.6

data/README.rdoc

@@ -1,6 +1,6 @@
 = garbageman
 
-Description goes here.
+Rubies GC can take a long time.  And while ruby is garbage collecting nothing else can happen.  This is especially bad in an async environment like EventMachine where it is a single thread process.  The GarbageMan disable rubies GC while processing requests.  And while it is GCing it takes it self out of the nginx upstream.
 
 == Contributing to garbageman
  

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/garbageman.gemspec

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

data/lib/garbageman/collector.rb

@@ -4,6 +4,15 @@ module GarbageMan
   class Collector
     include Singleton
 
+    module Status
+      SELECTED = 'selected'
+      WILL_COLLECT = 'will_collect'
+      STARTING = 'starting'
+      NEXT_SERVER = 'next_server'
+    end
+
+    include Status
+
     attr_accessor :request_count, :will_collect
     attr_reader :fiber_poll
 
@@ -23,8 +32,15 @@ module GarbageMan
         return true
       end
 
+      if select_next_server?
+        EM.next_tick do
+          select_next_server
+        end
+        return true
+      end
+
       if should_collect?
-        write_gc_yaml server_index, 'will_collect'
+        write_gc_yaml server_index, WILL_COLLECT
         false
       else
         true
@@ -41,18 +57,18 @@ module GarbageMan
 
       return unless can_collect?
 
-      write_gc_yaml server_index, 'starting'
+      write_gc_yaml server_index, STARTING
       debug "starting gc"
       starts = Time.now
       GC.enable
       GC.start
       diff = (Time.now - starts) * 1000
       info "GC took #{'%.2f' % diff}ms"
-      write_gc_yaml server_index, 'finished'
+      write_gc_yaml server_index, NEXT_SERVER
 
       reset
 
-      if can_disable? && select_next_server
+      if can_disable?
         debug "disabling gc"
         GC.disable
       else
@@ -64,7 +80,7 @@ module GarbageMan
     def create_gc_yaml
       return unless server_index
       return if File.exists?(Config.gc_yaml_file)
-      write_gc_yaml server_index, 'selected'
+      write_gc_yaml server_index, SELECTED
     end
 
     def logger; GarbageMan.logger; end
@@ -98,7 +114,7 @@ module GarbageMan
         file = socket_file next_server_index
         next unless File.exists?(file)
         debug "selected #{next_server_index}"
-        write_gc_yaml next_server_index, 'selected'
+        write_gc_yaml next_server_index, SELECTED
         return true
       end
       false
@@ -136,6 +152,11 @@ module GarbageMan
       config && config['gc'] && config['gc']['server'] && config['gc']['server'] == server_index
     end
 
+    def select_next_server?
+      config = Config.gc_config
+      config && config['gc'] && config['gc']['server'] && config['gc']['server'] == server_index && config['gc']['status'] == 'next_server'
+    end
+
     def can_disable?
       Config.thin_config.has_key?('socket') && not_queuing? && min_running_servers?
     end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4485848182295585686
+      hash: 244992225797517962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: