garbageman 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/garbageman.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "garbageman"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Doug Youch"]
+  s.date = "2013-06-10"
+  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 = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "garbageman.gemspec",
+    "lib/garbageman.rb",
+    "lib/garbageman/collector.rb",
+    "lib/garbageman/config.rb",
+    "lib/garbageman/ext/thin.rb",
+    "lib/garbageman/rack/middleware.rb",
+    "test/helper.rb",
+    "test/test_garbageman.rb"
+  ]
+  s.homepage = "http://github.com/dyouch5@yahoo.com/garbageman"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Process requests without garbage collection"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end
+

data/lib/garbageman/collector.rb

@@ -66,7 +66,7 @@ module GarbageMan
     end
 
     def num_servers
-      self.thin_config['servers']
+      Config.thin_config['servers']
     end
 
     def write_gc_yaml(index, status)
@@ -77,7 +77,7 @@ module GarbageMan
     def select_next_server
       Config.thin_config['servers'].times do |i|
         next_server_index = (server_index + i + 1) % num_servers
-        file = self.thin_config['socket'].sub '.sock', ".#{next_server_index}.sock"
+        file = socket_file next_server_index
         next unless File.exists?(file)
         debug "selected #{next_server_index}"
         write_gc_yaml next_server_index, 'selected'
@@ -91,9 +91,13 @@ module GarbageMan
       @will_collect = false
     end
 
+    def busy?
+      fiber_poll && fiber_poll.busy_fibers.size > 0
+    end
+
     # no traffic and we've been selected by health check
     def can_collect?
-      @will_collect && fiber_pool.busy_fibers.size == 0 && Thin::Backends::Base.num_connections == 0
+      @will_collect && ! busy? && Thin::Backends::Base.num_connections == 0
     end
 
     # if the request count is high enough and it is our turn
@@ -114,7 +118,7 @@ module GarbageMan
     def not_alone?
       Config.thin_config['servers'].times do |i|
         next if i == server_index
-        file = self.thin_config['socket'].sub '.sock', ".#{i}.sock"
+        file = socket_file i
         if File.exists?(file)
           return true
         end
@@ -124,6 +128,10 @@ module GarbageMan
       false
     end
 
+    def socket_file(index)
+      Config.thin_config['socket'].sub '.sock', ".#{index}.sock"
+    end
+
     def logger; GarbageMan.logger; end
 
     def debug(msg)

data/lib/garbageman/config.rb

@@ -4,7 +4,7 @@ module GarbageMan
     def self.gc_health_check_request_path; @@gc_health_check_request_path; end
 
     @@gc_yaml_file = nil
-    def self.gc_yaml_file; @@gc_yaml_file ||= "#{Rails.root}/data/gc.yml"; end
+    def self.gc_yaml_file; @@gc_yaml_file ||= "./data/gc.yml"; end
     def self.gc_yaml_file=(file); @@gc_yaml_file = file; end
 
     def self.gc_config
@@ -16,7 +16,7 @@ module GarbageMan
     end
 
     @@thin_config = nil
-    def self.thin_config; @@thin_config ||= YAML.load_file("#{Rails.root}/config/thin.yml"); end
+    def self.thin_config; @@thin_config ||= YAML.load_file("./config/thin.yml"); end
 
     def self.num_request_before_collecting; 10; end
   end

data/lib/garbageman/ext/thin.rb

@@ -1,23 +1,25 @@
 module Thin
   module Backends
     class Base
-      cattr_reader :num_connections
       @@num_connections = 0
-      cattr_accessor :server_index
+      def self.num_connections; @@num_connections; end
       @@server_index = nil
+      def self.server_index; @@server_index; end
+      def self.server_index=(index); @@server_index = index; end
 
       def connection_finished_with_count(connection)
         connection_finished_without_count(connection).tap { @@num_connections -= 1 }
       end
-      alias_method_chain :connection_finished, :count
+      alias connection_finished_without_count connection_finished
+      alias connection_finished connection_finished_with_count
 
       protected
 
       def initialize_connection_with_count(connection)
         initialize_connection_without_count(connection).tap { @@num_connections += 1 }
       end
-      alias initialize_connection_without_count count
-      alias count initialize_connection_with_count
+      alias initialize_connection_without_count initialize_connection
+      alias initialize_connection initialize_connection_with_count
     end
 
     class TcpServer

data/lib/garbageman/rack/middleware.rb

@@ -8,12 +8,12 @@ module GarbageMan
       @@ok_response = [200, {'Content-Length' => '0'}, '']
       @@gc_response = [589, {'Content-Length' => '0'}, '']
       def call(env)
-        GcCollector.instance.request_count += 1
+        GarbageMan::Collector.instance.request_count += 1
 
         if env['REQUEST_PATH'] == GarbageMan::Config.gc_health_check_request_path
           GarbageMan::Collector.instance.healthy? ? @@ok_response : @@gc_response
         else
-          GcCollector.instance.debug("still receiving traffic even though I'm waiting to GC") if GcCollector.instance.will_collect
+          GarbageMan::Collector.instance.logger.error("still receiving traffic even though I'm waiting to GC") if GarbageMan::Collector.instance.will_collect
           @app.call(env)
         end
       end

data/lib/garbageman.rb

@@ -20,3 +20,8 @@ module GarbageMan
     @logger = logger
   end
 end
+
+require 'garbageman/config'
+require 'garbageman/ext/thin'
+require 'garbageman/rack/middleware'
+require 'garbageman/collector'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garbageman
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -76,6 +76,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- garbageman.gemspec
 - lib/garbageman.rb
 - lib/garbageman/collector.rb
 - lib/garbageman/config.rb
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3258579490044163618
+      hash: -664374349812690077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: