garbageman 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU0OGJhZGVmOGJhNDE4MTBlODA0ODBmZTgyOTkxNDhlMjJiOGVjMA==
+    NmM0NDc0NGU5MTVhODlkZDM5ZTkyNzE5NDI5MDk2NjFjYTRjNWRiZA==
   data.tar.gz: !binary |-
-    NmFjYWYzMDdkNjUwYWQ3YjhiMzk1MDMyMjJkYjFjMTViZjlkYmRkMw==
+    MTE2NWEyYTUwMmQ3ZDI4ZmQzMWEyNmM5YWVmNzFmYjk2M2ZiNGM1ZA==
 SHA512:
   metadata.gz: !binary |-
-    M2JhZjkzNjdlNTg5YmFmZmMzOTQzYzFkMjFjYTE3NzZmNTdlMTY5ZTg4OThh
-    ZjgxZDYwZjRlNjAxNjliYzIyYmFmNWE3ZmRkZjZjYzNjZTdjMTJjY2QyZTcx
-    NWMwMDNmYTg3MzY3ZTMyNzUyMTk2ZDA2ZTViNzFkMmQ4YmQxOTM=
+    YmNjNzNkODUxYzJkYzQ0ODVjYzVkMjBkM2FlMDE1Y2JmZDEyNjY1OTE0NmVl
+    MmIzNzRjMmY3OTI3MjRjMTE3ZmJmZjQzM2RmYmY5ZGU4MjBiZjc5YzgyMGUw
+    MDNjMmU0ZTNmMTI1YTVlMmZhZjFmNjdmYTY5N2EwMzFkMjAxNDk=
   data.tar.gz: !binary |-
-    ZDIwMjZlZTU3ZTk1OGUwMjlmZjhhY2NkZmFmNWVhNTg4ZjY1ZGMzZjQ3ZGI3
-    ZDg1YzJmYjU3MjllNDNhOGUyYjNmMjAzMWM1YzU1OGMwMjJmOTg4NGRhYTY5
-    MGVmYjBlYWQ2YmJjMDlkNmM5MDYxN2EzZmEzNjBhZmE1NjYwMDM=
+    ZGJjZjVlZTk2NTYxZjE5ZDA3NTQ2ZTU1YWNlZmRiMWNiZWE4Y2RhZThlNmZk
+    M2M1ODI1NDFmMGExMDM4YzdkMjJiYzdhYmI5ZjgyYjY4MzdiZjFiMTBmYmM2
+    ZWRiNzIzNjFlZDM4ZjRmNDk0YzI3ZjUyYmQ0ZThmMmM4ZjRiZjU=

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/garbageman.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: garbageman 0.2.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Doug Youch"]
-  s.date = "2014-02-20"
+  s.date = "2015-07-29"
   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 = [
@@ -39,12 +41,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dyouch5@yahoo.com/garbageman"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.6"
   s.summary = "Process requests without garbage collection"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])

data/lib/garbageman/collector.rb

@@ -20,12 +20,13 @@ module GarbageMan
       WAITED_TOO_LONG = "waited %.2f seconds to gc"
       DISABLE_GC = "disabling gc"
       CANT_TURN_OFF = "enabling gc, can not turn off"
+      CONNECTIONS_DID_NOT_DRAIN_IN_TIME = 'connections did not drain in time'
     end
 
     include Messages
 
     attr_accessor :request_count, :will_collect, :will_select_next_server, :show_gc_times
-    attr_reader :fiber_poll, :last_gc_finished_at, :before_gc_callbacks, :after_gc_callbacks
+    attr_reader :fiber_poll, :last_gc_finished_at, :before_gc_callbacks, :after_gc_callbacks, :selected_to_collect_at
 
     def initialize
       @show_gc_times = true
@@ -57,6 +58,7 @@ module GarbageMan
       end
 
       if should_collect?
+        @selected_to_collect_at ||= Time.now
         write_gc_yaml server_index, WILL_COLLECT
         false
       else
@@ -74,8 +76,15 @@ module GarbageMan
         GC.enable
       end
 
-      return unless can_collect?
-
+      unless can_collect?
+        return unless will_collect # return unless been selected to gc
+        if waited_too_long_for_connections_to_drain?
+          warn CONNECTIONS_DID_NOT_DRAIN_IN_TIME
+        else
+          return
+        end
+      end
+      
       before_gc_callbacks.each(&:call)
 
       write_gc_yaml server_index, STARTING
@@ -159,6 +168,7 @@ module GarbageMan
       @request_count = 0
       @will_collect = false
       @will_select_next_server = false
+      @selected_to_collect_at = nil
     end
 
     def busy?
@@ -233,6 +243,10 @@ module GarbageMan
       return false unless @last_gc_finished_at
       (Time.now - @last_gc_finished_at) >= Config.max_time_without_gc
     end
+
+    def waited_too_long_for_connections_to_drain?
+      @selected_to_collect_at && (Time.now - @selected_to_collect_at) >= Config.max_connection_drain_time
+    end
   end
 end
 

data/lib/garbageman/config.rb

@@ -47,5 +47,10 @@ module GarbageMan
     @@max_time_without_gc = 60
     def self.max_time_without_gc; @@max_time_without_gc; end
     def self.max_time_without_gc=(time); @@max_time_without_gc = time; end
+
+    # max time to wait for connections to drain
+    @@max_connection_drain_time = 60
+    def self.max_connection_drain_time; @@max_connection_drain_time; end
+    def self.max_connection_drain_time=(time); @@max_connection_drain_time = time; end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Process requests without garbage collection
 test_files: []