server-starter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b2e1016a56a58b14b4aeaaa37823b343816a5f
-  data.tar.gz: 85ec3da094558506221d980a185f7a2dcb8e79f9
+  metadata.gz: 172f969ecca0954a1b3f5a44df94ad9e391893cf
+  data.tar.gz: 414f7dc2679b28e65d4d8ebc289032540476d83f
 SHA512:
-  metadata.gz: 671005c01b169fa2c415f93ccd12817b80ccd938aca82355313f74465419d93d188624353a0d94be77dc30a9b6f4bef397364b6c64fc2b80fa854b45d3eac886
-  data.tar.gz: 74d3bcc535fa7d3613f9e68369d467603b85640269eee77821baa3ca6c85ef6a186e6d871cd3f14b672407b4095e2fc8d5c46b25df671efad89a8f141a5f963d
+  metadata.gz: f5e0704849bf69e29e582cea3681bdf3f5578ead49cea74f87cb919ecbafafe975dd537f6e60dfdb42378dc124f98a14c0d8eb46bf76b32793d7b4628621dae8
+  data.tar.gz: d2f77e9459789f62758b8f0a24bd090a295646e5e4b3d681e9cec992824234a661cf7f10737b8cad5810c7d1cf99de5ab3ee4dcaed56b09354912d91b59c3d82

data/CHANGELOG.md

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

data/bin/start_puma.rb

@@ -1,15 +1,11 @@
 #!/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
+require 'server/starter/puma_listener'
+listener = ::Server::Starter::PumaListener
+
+unless listener.listen # Configure PUMA_INHERIT_\d NEV
+  $stderr.puts "[ERROR] Not running under server starter"
+  exit 1
 end
 
 args = ARGV.dup

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

@@ -1,3 +1,6 @@
+require 'server/starter/puma_listener'
+listener = ::Server::Starter::PumaListener
+
 APP_ROOT = File.expand_path('../..', __FILE__)
 status_file = File.join(APP_ROOT, 'log/start_server.stat')
 
@@ -17,15 +20,13 @@ 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
+if ENV['SERVER_STARTER_PORT']
+  puma_inherits = listener.listen
+  puma_inherits.each do |puma_inherit|
+    bind puma_inherit[:url]
   end
 else
-  # Fallback if not running under Server::Starter
+  puts '[WARN] Fallback to 0.0.0.0:10080 since not running under Server::Starter'
   bind 'tcp://0.0.0.0:10080'
 end
 

data/lib/server/starter/puma_listener.rb

@@ -3,7 +3,17 @@ 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"
+      return nil unless ENV.key?('SERVER_STARTER_PORT')
+      ENV['SERVER_STARTER_PORT'].split(';').map.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}"
+        { fd: fd, url: url }
+      end
     end
   end
 end

data/lib/server/starter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server-starter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Naotoshi Seo