whimsy-asf 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f924b1857e96a3bd4a2bd75839d149c7878a00e6
-  data.tar.gz: 09c84284eb5d791040fb2289d2c4ee6ac5d9ee63
+  metadata.gz: 7488584a6f4cafc47dc234295ad6e046f1e491eb
+  data.tar.gz: 3b2adc822404304bad77f14a4dd76262660a77cf
 SHA512:
-  metadata.gz: 654ef995bd682ff067ccaafe09bbbab30356fe5e367201057d89bc990466e95ae438029fb53390490887da510518f3ce177d4d568831c2562845b700242d53b5
-  data.tar.gz: 1c69d9652038b168085544dae93b210e1b4bb1be931820ae50e3bc94e3c707178b81654d2f1ab3f8685c94ab8b2bbff7ef2e1951dd950cb5de2120c3a3afed7f
+  metadata.gz: 9093b11de30d5247c570fff9d491b41868688d74b208399f17a29a9183b11c91ebc0680b71100a385d03bc819edc6906f50f86e0878f43fa2279fc4db8e51c84
+  data.tar.gz: dbeb058102b873298f396e6cc5d44ac6d1dd1a37bf185a7df9c957035f9f96ae4a1771cf1afb3739df5ab4be91e9ea28f4f6e72f27b109187ae98828933ebd0c

data/asf.version

@@ -1 +1 @@
-0.0.70
+0.0.71

data/lib/whimsy/asf/ldap.rb

@@ -1,5 +1,6 @@
 require 'wunderbar'
 require 'ldap'
+require 'weakref'
 
 module ASF
   module LDAP
@@ -107,22 +108,32 @@ module ASF
     end
 
     def self.[] name
-      collection[name] || new(name)
+      new(name)
     end
 
     def self.find name
-      collection[name] || new(name)
+      new(name)
     end
 
     def self.new name
-      collection[name] || super
+      begin
+        object = collection[name]
+        return object.reference if object and object.weakref_alive?
+      rescue
+      end
+
+      super
     end
 
     def initialize name
-      self.class.collection[name] = self
+      self.class.collection[name] = WeakRef.new(self)
       @name = name
     end
 
+    def reference
+      self
+    end
+
     unless Object.respond_to? :id
       def id
         @name

data/lib/whimsy/asf/rack.rb

@@ -1,6 +1,7 @@
 require_relative '../asf.rb'
 require 'rack'
 require 'etc'
+require 'thread'
 
 module ASF
   module Auth
@@ -33,7 +34,7 @@ module ASF
       ASF::Person.new(env.user)
     end
 
-    # Simply 'use' the following class in config.ru to limit access
+    # 'use' the following class in config.ru to limit access
     # to the application to ASF committers
     class Committers < Rack::Auth::Basic
       def initialize(app)
@@ -53,7 +54,7 @@ module ASF
       end
     end
 
-    # Simply 'use' the following class in config.ru to limit access
+    # 'use' the following class in config.ru to limit access
     # to the application to ASF members and officers and the accounting group.
     class MembersAndOfficers < Rack::Auth::Basic
       def initialize(app)
@@ -84,6 +85,87 @@ module ASF
     end
   end
 
+  # 'use' the following class in config.ru to automatically run
+  # Garbage Collection every 'n' requests, or 'm' minutes.
+  #
+  # This tries to run garbage collection "out of band" (i.e., between
+  # requests), and when other requests are active (which can happen
+  # with threaded servers like Puma).
+  #
+  # In addition to keeping memory usage bounded, this keeps the LDAP
+  # cache from going stale.
+  #
+  class AutoGC
+    @@background = nil
+
+    def initialize(app, frequency=100, minutes=15)
+      @app = app
+      @frequency = frequency
+      @request_count = 0
+      @queue = Queue.new
+      @mutex = Mutex.new
+
+      if defined?(PhusionPassenger)
+        # https://github.com/suyccom/yousell/blob/master/config.ru
+        # https://www.phusionpassenger.com/library/indepth/ruby/out_of_band_work.html
+        if PhusionPassenger.respond_to?(:require_passenger_lib)
+          PhusionPassenger.require_passenger_lib 'rack/out_of_band_gc'
+        else
+          # Phusion Passenger < 4.0.33
+          require 'phusion_passenger/rack/out_of_band_gc'
+        end
+        @passenger = PhusionPassenger::Rack::OutOfBandGc.new(app.count)
+      end
+
+      Thread.kill(@@background) if @@background
+
+      if minutes
+        # divide minutes by frequency and use the result to determine the
+        # time between simulated requests
+        @@background = Thread.new do
+           seconds = minutes * 60.0 / frequency
+           loop do
+             sleep seconds
+             maybe_perform_gc
+           end
+        end
+      end
+    end
+
+    def call(env)
+      @queue.push 1
+
+      if @passenger
+        @passenger.call(env)
+      else
+        # https://github.com/puma/puma/issues/450
+        status, header, body = @app.call(env)
+
+        if ary = env['rack.after_reply']
+          ary << lambda {maybe_perform_gc}
+        else
+          Thread.new {sleep 0.1; maybe_perform_gc}
+        end
+
+        [status, header, body]
+      end
+    ensure
+      @queue.pop
+    end
+
+    def maybe_perform_gc
+      @mutex.synchronize do
+        @request_count += 1
+        if @queue.empty? and @request_count >= @frequency
+          @request_count = 0
+          disabled = GC.enable
+          GC.start
+          GC.disable if disabled
+        end
+      end
+    end
+  end
+
   # Apache httpd on whimsy-vm is behind a proxy that converts https
   # requests into http requests.  Update the environment variables to
   # match.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - Sam Ruby
@@ -14,84 +14,84 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wunderbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -137,12 +137,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []