server-starter 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c36a989a31dbedc64dbf0151ae27ba31b62423
-  data.tar.gz: 4cf2050173783280a3c4a0f649af09badb8715b6
+  metadata.gz: c8b2e1016a56a58b14b4aeaaa37823b343816a5f
+  data.tar.gz: 85ec3da094558506221d980a185f7a2dcb8e79f9
 SHA512:
-  metadata.gz: 4f40f2dfcb2b27c656948cabd4971dfec25ecc190fbce8373c0483736bac0c19396be8afa46e19657cca01f8bedb5bca67ff7587933c006ab382fe1123dc236a
-  data.tar.gz: b5e563e113f13c990aefae3a29caa4d638a289d44ed3fc94d284c2da9c56645a87fac77de13f3c16501b7675eb3233490e274ffafb67edd216a6287a642579d0
+  metadata.gz: 671005c01b169fa2c415f93ccd12817b80ccd938aca82355313f74465419d93d188624353a0d94be77dc30a9b6f4bef397364b6c64fc2b80fa854b45d3eac886
+  data.tar.gz: 74d3bcc535fa7d3613f9e68369d467603b85640269eee77821baa3ca6c85ef6a186e6d871cd3f14b672407b4095e2fc8d5c46b25df671efad89a8f141a5f963d

data/.gitignore

@@ -16,3 +16,4 @@ pkg/*
 start_server.stat
 start_server.pid
 start_server.log
+puma.state

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2016/04/03)
+
+Enhancements:
+
+* Add puma support
+
 ## 0.1.5 (2016/04/03)
 
 Fixes:

data/bin/start_puma.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby
+
+if ENV.key?('SERVER_STARTER_PORT')
+  ENV['SERVER_STARTER_PORT'].split(';').each.with_index do |x, i|
+    path_or_port, fd = x.split('=', 2)
+    if path_or_port.match(/(?:^|:)\d+$/)
+      url = "tcp://#{path_or_port}"
+    else
+      url = "unix://#{path_or_port}"
+    end
+    ENV["PUMA_INHERIT_#{i}"] = "#{fd}:#{url}"
+  end
+end
+
+args = ARGV.dup
+args << { :close_others => false }
+Kernel.exec(*args)

data/example/puma/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'server-starter', path: '../../'
+gem 'puma'
+gem 'pry'
+gem 'pry-nav'

data/example/puma/config/puma.conf.rb

@@ -0,0 +1,54 @@
+APP_ROOT = File.expand_path('../..', __FILE__)
+status_file = File.join(APP_ROOT, 'log/start_server.stat')
+
+pidfile File.join(APP_ROOT, 'log/puma.pid')
+state_path File.join(APP_ROOT, 'log/puma.state')
+
+# prune_bundler # need to tweak lib/puma/launher to add { close_others: false } opts to Kernel.exec
+preload_app!
+
+# Configure "min" to be the minimum number of threads to use to answer
+# requests and "max" the maximum.
+# The default is "0, 16".
+threads 0, 16
+
+# How many worker processes to run. The default is "0".
+workers 2
+
+# Run puma via start_puma.rb to configure PUMA_INHERIT_\d ENV from SERVER_STARTER_PORT ENV as
+# $ bundle exec --keep-file-descriptors start_puma.rb puma -C config/puma.conf.rb config.ru
+if ENV['PUMA_INHERIT_0']
+  ENV.each do |k,v|
+    if k =~ /PUMA_INHERIT_\d+/
+      fd, url = v.split(":", 2)
+      bind url
+    end
+  end
+else
+  # Fallback if not running under Server::Starter
+  bind 'tcp://0.0.0.0:10080'
+end
+
+# Code to run before doing a restart. This code should
+# close log files, database connections, etc.
+# This can be called multiple times to add code each time.
+on_restart do
+  puts 'On restart...'
+end
+
+# Code to run when a worker boots to setup the process before booting
+# the app. This can be called multiple times to add hooks.
+on_worker_boot do
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+end
+
+# Code to run when a worker boots to setup the process after booting
+# the app. This can be called multiple times to add hooks.
+after_worker_boot do
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+end
+
+# Code to run when a worker shutdown.
+on_worker_shutdown do
+  puts 'On worker shutdown...'
+end

data/example/puma/start_server

@@ -0,0 +1,16 @@
+#!/bin/sh
+bundle exec start_server.rb \
+  --port=0.0.0.0:10080 \
+  --dir=$(pwd) \
+  --interval=1 \
+  --signal-on-hup=TERM \
+  --signal-on-TERM=TERM \
+  --pid-file=$(pwd)/log/start_server.pid \
+  --status-file=$(pwd)/log/start_server.stat \
+  --envdir=env \
+  --enable-auto-restart \
+  --auto-restart-interval=100 \
+  --kill-old-delay=10 \
+  --backlog=100 \
+  -- \
+  bundle exec --keep-file-descriptors start_puma.rb puma -C config/puma.conf.rb config.ru 2>&1

data/example/{Gemfile → unicorn/Gemfile}

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'server-starter', path: '../'
+gem 'server-starter', path: '../../'
 gem 'unicorn'
 gem 'pry'
 gem 'pry-nav'

data/example/{config → unicorn/config}/unicorn.conf

@@ -7,7 +7,7 @@ preload_app true
 APP_ROOT = File.expand_path('../..', __FILE__)
 status_file = File.join(APP_ROOT, 'log/start_server.stat')
 
-fd = listener.listen
+fd = listener.listen # Configure UNICORN_FD ENV
 unless fd
   # Fallback if not running under Server::Starter
   listen ENV['PORT'] || '10080'

data/example/unicorn/config.ru

@@ -0,0 +1,11 @@
+class SimpleApp
+  def call(env)
+    [
+      200,
+      {'Content-Type' => 'text/html'},
+      ['Hello World']
+    ]
+  end
+end
+
+run SimpleApp.new

data/example/unicorn/env/TEST

@@ -0,0 +1 @@
+foo

data/example/unicorn/restart_server

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle exec start_server.rb --restart --pid-file=log/start_server.pid --status-file=log/start_server.stat

data/lib/server/starter/puma_listener.rb

@@ -0,0 +1,9 @@
+require 'server/starter/version'
+
+class Server::Starter
+  class PumaListener
+    def self.listen
+      $stderr.puts "Configure ENV in config seems too late. Use start_puma.rb instead"
+    end
+  end
+end

data/lib/server/starter/version.rb

@@ -1,5 +1,5 @@
 class Server
   class Starter
-    VERSION = '0.1.5'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server-starter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -28,6 +28,7 @@ description: a superdaemon for hot-deploying server programs (ruby port of p5-Se
 email:
 - sonots@gmail.com
 executables:
+- start_puma.rb
 - start_server.rb
 extensions: []
 extra_rdoc_files: []
@@ -38,16 +39,25 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/start_puma.rb
 - bin/start_server.rb
-- example/Gemfile
-- example/config.ru
-- example/config/unicorn.conf
-- example/env/TEST
-- example/log/.gitkeep
-- example/restart_server
-- example/start_server
+- example/puma/Gemfile
+- example/puma/config.ru
+- example/puma/config/puma.conf.rb
+- example/puma/env/TEST
+- example/puma/log/.gitkeep
+- example/puma/restart_server
+- example/puma/start_server
+- example/unicorn/Gemfile
+- example/unicorn/config.ru
+- example/unicorn/config/unicorn.conf
+- example/unicorn/env/TEST
+- example/unicorn/log/.gitkeep
+- example/unicorn/restart_server
+- example/unicorn/start_server
 - lib/server/starter.rb
 - lib/server/starter/helper.rb
+- lib/server/starter/puma_listener.rb
 - lib/server/starter/unicorn_listener.rb
 - lib/server/starter/version.rb
 - server-starter.gemspec