garbageman 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIzZmI4OTVlOTVhZTA2Y2M4ZTQwZTRhYWFlMjAzYjc2MmU5YjE3MA==
+    ZTUxY2YyM2I2ODhiMjVhYTA0Y2JlZjUzNGIzMDc4NjJjNDc4MzdiOQ==
   data.tar.gz: !binary |-
-    YTRjM2E2ZTE4NDg2N2E0NDg4YzVlYjE5ZTY0OTE5MzkzM2VhNzc4NQ==
+    YjI0NmU3NmFjZjcyMDdiNTJkNWQxOWJmYjQxNjk0OWRhZjhmZDk0MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDU5NjY5MjE4YmQ4NDkyZGU4NjM4ZmVmMzY4NGRhMGFmOWVmYmQzNGEyZTJl
-    Y2Y3MTcxNTc4MzIyYzlmYzE5NTdkZDJkNDIyOWVmZjE3MGVmZTc3YmYyY2M3
-    MjVkOGZlZjY0OGU5YjMwYjBlMjRjODJiMmIzMjdhZDcwMjdlOTk=
+    MWJlYjQ5Yjc2OWEzMjM4YTNmZTk0ODAzNmZiZTg4YzVkN2M5OGYyZDczOGM5
+    OWU0YjNiMTRjMTY2NzI2N2E0ZDFjNjQ1NmEwNzk3MjNmZjEzY2I3YWZjNTk0
+    ODY3Y2FiNjUwNmMyYzA5OGIwMjIxM2QxZTgzN2JjZTAwN2RjNzE=
   data.tar.gz: !binary |-
-    ZThhNjUyMTViMmM5NmEzMWY4MTNjZTRjYTFiYjhhMTVlYTllNzNjMzk4OTRj
-    NTYxZTEyMjQ3NTBhMzBjN2FhMDlkNTdhM2FjNDY5ZDQ4ZTZiZjE3MjFlMGM3
-    YjNmNDQxODJmYTE1OTY3MGYwN2Q4NTAxOThmM2UxNWNhY2M5NjM=
+    NjYzOWYzMjNiZjVlZDFlOGMwMDRlYWUwYjU4ODRhZTc5YTBhMThjZjgzYTU2
+    ZjUzYzkxOTUwZmRkNDA2MTRiMjdiNWJhZDNmZWFjZjY3NDk1NWU4NjNlMzk4
+    ZDE3NWUyN2UyMWI4NDYzZDM5N2E5MDcwODA4NDk4MTRkZmFiZWE=

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/garbageman.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/garbageman/collector.rb

@@ -78,6 +78,8 @@ module GarbageMan
       end
 
       unless can_collect?
+        @can_collect_at ||= Time.now
+        return unless (Time.now - @can_collect_at) >= Config.time_to_wait_before_collecting
         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
@@ -202,6 +204,7 @@ module GarbageMan
       @will_collect = false
       @will_select_next_server = false
       @selected_to_collect_at = nil
+      @can_collect_at = nil
     end
 
     def busy?

data/lib/garbageman/config.rb

@@ -64,5 +64,11 @@ module GarbageMan
     @@gc_sleep = 0.00
     def self.gc_sleep; @@gc_sleep; end
     def self.gc_sleep=(v); @@gc_sleep = v || 10; end
+
+    # after selected and connections are drained, wait this many seconds before
+    # collecting so that all proxies are aware that this process will collect
+    @@time_to_wait_before_collecting = 2.0
+    def self.time_to_wait_before_collecting; @@time_to_wait_before_collecting; end
+    def self.time_to_wait_before_collecting=(v); @@time_to_wait_before_collecting = v || 2.0; end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Doug Youch
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Process requests without garbage collection