luban-rack 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75dff673fdfb8b910f2c8a5fc1c9a831cd5c313f
-  data.tar.gz: 6e16e73badf9284fa25dbc3957382089f99ff2c3
+  metadata.gz: cbb9ea87d6f534b68912727570e3c6233ef32685
+  data.tar.gz: de08144a0493b050f6d979f62c5ac789f6dfbf2e
 SHA512:
-  metadata.gz: 29bd4d9a3c43e62e1b9c1887eddffe4328039788f8c00e9197c241d455b64690cda4cee8bf2b2650a48d62d320bf715242d4f46026c4346998b7ef4e4fa813d6
-  data.tar.gz: c582a1f63b6871c4209e2b2836e792f1f16e905fa21730b194b4d0e7ec6f9c2f17114369ea33b9252bc0a24619579a5888508abd63979772f70fd99091c3f768
+  metadata.gz: bd634449efb923be8f666a6da47ca5a7db3d8505de69e26de267852536217f906990b82367534b8bc608f2290417e8d3cddaa22da4800f6d0617f1a1fd653b41
+  data.tar.gz: 454d1316ad6cbec1cac6eef112a1dd2099198c69abadca773b128923a59cc220baaf28e2a1e8e878974e9d857ff47ea356fb42d83e08c3a3bd2895f54aef3ada

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## Version 0.1.2 (Jul 14, 2016)
+
+New features:
+  * Supported generation of Nginx proxy configuration
+
+* Bug fixes:
+  * Fixed issues to correctly set default web server options for Configurator and Controller
+  * Corrected issues when composing socket file path for cluster
+  * Changed the starting port for cluster to avoid conflicting to the actual port the web app uses
+
 ## Version 0.1.1 (Jul 11, 2016)
 
 New features:

data/lib/luban/deployment/applications/rack/base.rb

@@ -5,10 +5,14 @@ module Luban
         using Luban::CLI::CoreRefinements
 
         module Parameters
-          extend Luban::Deployment::Parameters::Base
+          extend Luban::Deployment::Parameters::Base  
 
+          DefaultPort = 3000
+          DefaultVirtualHost = 'localhost'
           DefaultWebServer = :thin
 
+          parameter :port
+          parameter :virtual_host
           parameter :web_server
 
           def power_by(server, **opts)
@@ -18,6 +22,8 @@ module Luban
           protected
 
           def set_default_rack_parameters
+            set_default :port, DefaultPort
+            set_default :virtual_host, DefaultVirtualHost
             set_default :web_server, name: DefaultWebServer, opts: {}
           end
         end

data/lib/luban/deployment/applications/rack/configurator.rb

@@ -9,6 +9,11 @@ module Luban
 
           protected
 
+          def init
+            super
+            set_default_web_server_options unless task.opts.release.nil?
+          end
+
           def web_server_module(path)
             @web_server_module ||= super.const_get('Common')
           end

data/lib/luban/deployment/applications/rack/controller.rb

@@ -33,6 +33,11 @@ module Luban
 
           protected
 
+          def init
+            super
+            set_default_web_server_options
+          end
+
           def restart_process!
             capture("#{restart_command} 2>&1")
           end

data/lib/luban/deployment/applications/rack/paths.rb

@@ -43,12 +43,21 @@ module Luban
             @sockets_path ||= shared_path.join('sockets')
           end
 
-          def socket_file_path
-            @socket_file_path ||= sockets_path.join(socket_file_name)
+          def socket_file_path(n = nil)
+            if n.nil?
+              @socket_file_path ||= sockets_path.join(socket_file_name)
+            else
+              sockets_path.join(socket_file_name(n))
+            end
           end
 
-          def socket_file_name
-            @socket_file_name ||= "#{web_server[:name]}.sock"
+          def socket_file_name(n = nil)
+            if n.nil?
+              @socket_file_name ||= "#{web_server[:name]}.sock"
+            else
+              "#{web_server[:name]}.#{n}.sock"
+            end
+
           end
 
           def ruby_bin_path

data/lib/luban/deployment/applications/rack/templates/thin/nginx.http.proxy.conf.erb

@@ -0,0 +1,45 @@
+# Nginx reverse proxy configuration for Thin
+
+<% opts = web_server[:opts] -%>
+upstream <%= service_entry %> {
+    # fail_timeout=0 means we always retry an upstream even if it failed
+    # to return a good HTTP response 
+
+    <%- if opts[:port] -%>
+    <%- opts[:servers].times do |n| -%>
+    server <%= opts[:address] %>:<%= opts[:port] + n %> fail_timeout=0;
+    <%- end -%>
+    <%- end -%>
+    <%- if opts[:socket] -%>
+    <%- opts[:servers].times do |n| -%>
+    server unix:<%= socket_file_path(n) %> fail_timeout=0;
+    <%- end -%>
+    <%- end -%>
+}
+
+server {
+    listen <%= port %>;
+    server_name <%= virtual_host %>;
+
+    # ~2 seconds is often enough for most cases to parse HTML/CSS and
+    # retrieve needed images/icons/frames, connections are cheap in
+    # nginx so increasing this is generally safe...
+    keepalive_timeout 5;
+
+    # path for static files
+    root <%= current_app_path %>/public;
+
+    location ~ ^/assets/ {
+        gzip_static on; # to serve pre-gizpped version
+        expires 1y;
+        add_header Cache-Control public;
+        add_header ETag "";
+        break;
+    }
+
+    try_files $uri/index.html $uri.html $uri @app;
+
+    location @app {
+      proxy_pass http://<%= service_entry %>;
+    }
+}

data/lib/luban/deployment/applications/rack/templates/thin/thin.monitrc.erb

@@ -10,7 +10,7 @@ check process <%= service_entry %>.<%= web_server[:name] %>.<%= n %>
   stop program = "/bin/bash -c '<%= stop_command %> -o <%=n %>'"
   if totalmem is greater than 150.0 MB for 40 cycles then alert
   <%- if opts[:port] -%>
-  if failed port <%= opts[:port].to_i + n %> for 4 times within 8 cycles then restart
+  if failed port <%= opts[:port] + n %> for 4 times within 8 cycles then restart
   <%- end -%>
   <%- if opts[:socket] -%>
   if failed unixsocket <%= socket_file_path(n) %> for 4 times within 8 cycles then restart

data/lib/luban/deployment/applications/rack/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Applications
       class Rack
-        VERSION = '0.1.1'
+        VERSION = '0.1.2'
       end
     end
   end

data/lib/luban/deployment/applications/rack/web_server.rb

@@ -18,7 +18,6 @@ module Luban
           def load_web_server
             require web_server_require_path
             singleton_class.send(:prepend, web_server_module(web_server_require_path))
-            set_default_web_server_options
           rescue LoadError => e
             abort "Aborted! Failed to load web server #{web_server[:name].inspect}."
           end

data/lib/luban/deployment/applications/rack/web_servers/thin.rb

@@ -9,7 +9,7 @@ module Luban
                 @default_web_server_options ||= {
                   # Server options
                   address: "0.0.0.0",
-                  port: 3000,
+                  port: port + 1,
                   socket: socket_file_path.to_s,
                   chdir: release_path.to_s,
                   # Adapter options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -88,6 +88,7 @@ files:
 - lib/luban/deployment/applications/rack/configurator.rb
 - lib/luban/deployment/applications/rack/controller.rb
 - lib/luban/deployment/applications/rack/paths.rb
+- lib/luban/deployment/applications/rack/templates/thin/nginx.http.proxy.conf.erb
 - lib/luban/deployment/applications/rack/templates/thin/thin.logrotate.erb
 - lib/luban/deployment/applications/rack/templates/thin/thin.monitrc.erb
 - lib/luban/deployment/applications/rack/templates/thin/thin.yml.erb