stalin 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358441ddd27f1ebef84ad030bb8ac3569a1aabd2
-  data.tar.gz: eb50ee94465f7eac9a4c7248317cee70696f21b3
+  metadata.gz: d3aba1948f1211ea981734cb7eb62d1326536b0b
+  data.tar.gz: 694df9a4c8732561d328a26ce17f64fa12eec669
 SHA512:
-  metadata.gz: cdb30d3fd48d13301330d0c895715e1d2087c1e63e2464935ca6c30d44fdce7351229232ad058bfb40e6cbd6b6fec125376c5256e3626c3f0f7cd96b8ac221c3
-  data.tar.gz: 26833e130901894f3be8a49631834eeffcb8e0e209db566d238f6a1b05785aaf5d1c5c34a3d8f2232a008b9f49f632878adbffd314822a59eb8a4b8e2365c470
+  metadata.gz: 6b922bd545a388a1457220caa2fe3d308d82401b59a25e01b667db3810263a8019fb304a80c3031cb66a298928e57b33aa07c2d147ce64cfc77d5cb668d9085b
+  data.tar.gz: fc6067a0ada40c95060d978c6615b9d0054ea2abc37a0062a54b91be2367f3ac6bae06c073166b1c2715f59e8e0200ab23b03d30836bb35170b04e3461791b0a

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/stalin/adapter/puma.rb

@@ -1,6 +1,8 @@
 module Stalin::Adapter
-  # A Stalin adapter that is suitable for use in Puma worker processes. Puma uses SIGTERM
-  # to initiate orderly shutdown and seems to respond to SIGQUIT with an abrupt shutdown.
+  # A Stalin adapter that is suitable for use in Puma worker processes. Puma has two
+  # execution models.
+  # - "Cluster" spawns N worker processes; each responds to SIGTERM with graceful shutdown and SIGQUIT with abrupt shutdown
+  # - "Single" runs a server in the one-and-only master process; it responds to SIGUSR2 with graceflu restart
   class Puma < Rack
     # Create a middleware instance.
     #
@@ -10,17 +12,19 @@ module Stalin::Adapter
     # @param [Integer] cycle how frequently to check memory consumption (# requests)
     # @param [Boolean] verbose log extra information
     def initialize(app, min=1024**3, max=2*1024**3, cycle=16, verbose=false)
+      # Puma has no singletons, so we need to grab a reference to its CLI object.
+      # The CLI will not exist if puma was invoked through rackup.
+      #
+      # Since the master forks its workers, the CLI object also exists in workers.
+      # By the time this code runs, we'll always be in a worker.
       cli = nil
-      ObjectSpace.each_object(::Puma::CLI) { |o| cli = o }
+      ObjectSpace.each_object(::Puma::CLI) { |o| cli = o } if defined?(::Puma::CLI)
 
-      raise RuntimeError, "Puma does not appear to be active; no instances of Puma::CLI reside in memory" unless cli
-
-      if cli.clustered? && cli.options[:workers] > 0
-        # We're clustered, so workers can SIGTERM themselves to cause a restart
+      if cli && cli.clustered? && cli.options[:workers] > 0
+        # Multiprocess model: send ourselves SIGTERM
         super(app, :TERM, :QUIT, min, max, cycle, verbose)
       else
-        # We're running in single mode; our one-and-only process must USR2 to restart
-        # itself
+        # Single-process model ("rackup," or "puma -w 0")
         super(app, :USR2, :USR1, min, max, cycle, verbose)
       end
     end

data/stalin.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stalin 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "stalin"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Tony Spataro"]
-  s.date = "2015-04-17"
+  s.date = "2015-04-21"
   s.description = "Kill Web application workers based on arbitrary conditions."
   s.email = "xeger@xeger.net"
   s.extra_rdoc_files = [
@@ -38,7 +36,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/xeger/stalin"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.14"
   s.summary = "Kill rack"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stalin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler