garbageman 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/garbageman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "garbageman"
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
-  s.date = "2013-06-25"
+  s.date = "2013-09-24"
   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 = [

data/lib/garbageman/collector.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'fileutils'
 
 module GarbageMan
   class Collector
@@ -13,6 +14,16 @@ module GarbageMan
 
     include Status
 
+    module Messages
+      CAN_NOT_DISABLE_GC = "can not disable gc"
+      QUEUING_REQUESTS = "queuing request, enabling gc"
+      WAITED_TOO_LONG = "waited too long to gc"
+      DISABLE_GC = "disabling gc"
+      CANT_TURN_OFF = "enabling gc, can not turn off"
+    end
+
+    include Messages
+
     attr_accessor :request_count, :will_collect, :will_select_next_server, :show_gc_times
     attr_reader :fiber_poll, :last_gc_finished_at
 
@@ -28,7 +39,7 @@ module GarbageMan
 
     def healthy?
       unless can_disable?
-        debug "can not disable gc"
+        debug CAN_NOT_DISABLE_GC
         GC.enable
         return true
       end
@@ -54,15 +65,11 @@ module GarbageMan
     def collect
       # if we are starting to queue requests turn on gc, we could be in trouble
       if queuing?
-        debug "queuing request, enabling gc"
+        debug QUEUING_REQUESTS
         GC.enable
-        return
-      end
-
-      if waited_too_long_to_gc?
-        debug "waited too long to gc"
+      elsif waited_too_long_to_gc?
+        debug WAITED_TOO_LONG
         GC.enable
-        return
       end
 
       return unless can_collect?
@@ -80,10 +87,10 @@ module GarbageMan
       reset
 
       if can_disable?
-        debug "disabling gc"
+        debug DISABLE_GC
         GC.disable
       else
-        debug "enabling gc, can not turn off"
+        debug CANT_TURN_OFF
         GC.enable
       end
     end
@@ -130,9 +137,12 @@ module GarbageMan
       Config.thin_config['servers']
     end
 
+    WRITE_MOVE_OPTIONS = {:force => true}
     def write_gc_yaml(index, status)
       config = {'gc' => {'server' => index, 'status' => status}}
-      File.open(Config.gc_yaml_file, 'w+') { |f| f.write config.to_yaml }
+      File.open(Config.gc_yaml_tmp_file, 'w+') { |f| f.write config.to_yaml }
+      # atomic write
+      FileUtils.mv Config.gc_yaml_tmp_file, Config.gc_yaml_file, WRITE_MOVE_OPTIONS
     end
 
     def reset
@@ -211,7 +221,6 @@ module GarbageMan
 
     def waited_too_long_to_gc?
       return false unless @last_gc_finished_at
-      return false if @will_collect
       (Time.now - @last_gc_finished_at) >= Config.max_time_without_gc
     end
   end

data/lib/garbageman/config.rb

@@ -7,6 +7,10 @@ module GarbageMan
     def self.gc_yaml_file; @@gc_yaml_file ||= "./data/gc.yml"; end
     def self.gc_yaml_file=(file); @@gc_yaml_file = file; end
 
+    @@gc_yaml_tmp_file = nil
+    def self.gc_yaml_tmp_file; @@gc_yaml_tmp_file ||= "./data/.tmp.gc.yml"; end
+    def self.gc_yaml_tmp_file=(file); @@gc_yaml_tmp_file = file; end
+
     def self.gc_config
       begin
         File.exists?(self.gc_yaml_file) ? YAML.load_file(self.gc_yaml_file) : nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2888262783155275332
+      hash: -76733894484378456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: