server-starter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d1306d9f95c35e64ad0e04bd294bee7ce9299ad
-  data.tar.gz: cb63d773356e83d97c79fe1db9473b9bda6e9706
+SHA256:
+  metadata.gz: 5ee6c5c725642797b8cfe87cc099dd5182f2059b901b3ac494b41f80116dd297
+  data.tar.gz: 5bcdb4c9c064b5af13983c6fe174b2612f22d5bed975d412db19fe8ab6025e6a
 SHA512:
-  metadata.gz: 0423e31d4a72dad4759d7889e050e7d41a1317e85cf7b553869d28262e3fda52f2bc22ed865ccde2ea334741ccd477aafef05e0c46df65a621353e4287cdd520
-  data.tar.gz: 23f27dba0752d06bcf0b10b08a87f998bf8f667cdb54eaf02e9ff3cb65c61937a7303339a4883822b140b084161f48282b71049e52449f7777fc3093ae6c835e
+  metadata.gz: c875da7e9d71f1bb0cb8f25601248f046355690865ad5ce8336b34499602c5e330c50486b96f8b1f17d94be3008f8fc2903e6dfb7e4207ed8e2059a12e045600
+  data.tar.gz: 2d98c0cdb9aa6959e8a871032877f0ec3a41a525543c4fee416de38b687883a98789adbb6c7eed85843e4509ac77b7d7e6e459c70df20ebc66807dac123dc110

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.2 (2022/05/09)
+
+Enhancements:
+
+* Support puma5 (thanks to limitusus)
+
 ## 0.3.1 (2016/08/26)
 
 Enhancements:

data/README.md

@@ -161,6 +161,36 @@ on_worker_shutdown do
 end
 ```
 
+## Options
+
+To be written
+
+### --envdir [dir]
+
+Configure environment variables from files on given directory, and reload on restarting.
+
+The directory structure is inspired from [envdir](https://cr.yp.to/daemontools/envdir.html) of daemontools.
+The filename is the environment variable name, and its content (first line) is the value of the environment variable.
+
+Example)
+
+```
+$ find env
+env/RAILS_ENV
+env/LANG
+```
+
+```
+$ cat env/RAILS_ENV
+production
+$ cat env/LANG
+en_US.UTF-8
+```
+
+which are equivalent with `env RAILS_ENV=production LANG=en_US.UTF-8` in shell.
+
+Please note that environment variables are updated on restarting, which means deleted files are not affected.
+
 ## See Also
 
 * [「Server::Starterに対応するとはどういうことか」の補足](http://blog.livedoor.jp/sonots/archives/40248661.html) (Japanese)

data/example/resque/config/resque.conf.rb

@@ -14,11 +14,15 @@ status_file File.join(APP_ROOT, 'log/start_resque.stat')
 start_server_status_file = File.join(APP_ROOT, 'log/start_server.stat')
 
 before_fork do |starter, worker, worker_nr|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+
+  sleep 1
 end
 
 after_fork do |starter, worker, worker_nr|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
 
   # Graceful restart
   #

data/example/unicorn/config/unicorn.conf.rb

@@ -14,7 +14,8 @@ unless fd
 end
  
 before_fork do |server, worker|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
  
   # Throttle the master from forking too quickly by sleeping.  Due
   # to the implementation of standard Unix signal handlers, this
@@ -24,7 +25,8 @@ before_fork do |server, worker|
 end
  
 after_fork do |server, worker|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
 
   # This is optional
   #

data/lib/server/starter/puma_listener.rb

@@ -1,4 +1,5 @@
 require 'server/starter/version'
+require 'puma/const'
 
 class Server::Starter
   class PumaListener
@@ -11,7 +12,12 @@ class Server::Starter
         else
           url = "unix://#{path_or_port}"
         end
-        ENV["PUMA_INHERIT_#{i}"] = "#{fd}:#{url}"
+        if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('5')
+          ENV["PUMA_INHERIT_#{i}"] = "#{fd}:#{url}"
+        else
+          ENV['LISTEN_FDS'] = '1'
+          ENV['LISTEN_PID'] = Process.pid.to_s
+        end
         { fd: fd, url: url }
       end
     end

data/lib/server/starter/resque_listener.rb

@@ -17,9 +17,6 @@ class Server::Starter
       if old_pid = pids[old_gen.to_s]
         sig = (worker_nr + 1) >= starter.num_workers ? :QUIT : :TTOU
         Process.kill(sig, old_pid.to_i)
-        while starter.old_workers.size > starter.num_workers
-          sleep 0.1
-        end
       end
     rescue Errno::ENOENT, Errno::ESRCH => e
       $stderr.puts "#{e.class} #{e.message}"

data/lib/server/starter/version.rb

@@ -1,5 +1,5 @@
 class Server
   class Starter
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-starter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: a superdaemon for hot-deploying server programs (ruby port of p5-Server-Starter)