luban-rack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88aed31e8c5bd4a6902db96f703cb1033697aa34
-  data.tar.gz: a7c17e9b1bb17d88e222490bda22c95ed88441c2
+  metadata.gz: 75dff673fdfb8b910f2c8a5fc1c9a831cd5c313f
+  data.tar.gz: 6e16e73badf9284fa25dbc3957382089f99ff2c3
 SHA512:
-  metadata.gz: 28b52f98ba0219a1bae69d782147c701f3a764be622b7cf9dfa1bb11ce459dfdaa48bcb38575495a990bb3fd5eb831d911ac7f5579e3980ec26d241331766ff6
-  data.tar.gz: ebcccb620f86e27be90ae52f9ae015a26690925f81abe9911ecf408d4db7d111aeda73a205db971fb7c38cb910c62d06e6d11a7751dd65f84384e96f540b4d71
+  metadata.gz: 29bd4d9a3c43e62e1b9c1887eddffe4328039788f8c00e9197c241d455b64690cda4cee8bf2b2650a48d62d320bf715242d4f46026c4346998b7ef4e4fa813d6
+  data.tar.gz: c582a1f63b6871c4209e2b2836e792f1f16e905fa21730b194b4d0e7ec6f9c2f17114369ea33b9252bc0a24619579a5888508abd63979772f70fd99091c3f768

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## Version 0.1.1 (Jul 11, 2016)
+
+New features:
+  * Refactored web server for Rack to support cluster
+
 ## Version 0.1.0 (Jul 08, 2016)
 
 New features:

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

@@ -11,17 +11,21 @@ module Luban
 
           parameter :web_server
 
+          def power_by(server, **opts)
+            web_server name: server, opts: opts
+          end
+
           protected
 
           def set_default_rack_parameters
-            set_default :web_server, DefaultWebServer
+            set_default :web_server, name: DefaultWebServer, opts: {}
           end
         end
 
         include Parameters
 
         def default_templates_path
-          @default_templates_path ||= super(__FILE__).join(web_server.to_s)
+          @default_templates_path ||= super(__FILE__).join(web_server[:name].to_s)
         end
 
         dispatch_task :phased_restart_process, to: :controller

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

@@ -3,21 +3,14 @@ module Luban
     module Applications
       class Rack
         class Configurator < Luban::Deployment::Application::Configurator
-          using Luban::CLI::CoreRefinements
-
           include Paths
           include Parameters
+          include WebServer
 
           protected
 
-          def init
-            load_web_server
-          end
-
-          def load_web_server
-            require_relative "web_servers/#{web_server}"
-            server_module = WebServers.const_get(web_server.camelcase).const_get('Common')
-            singleton_class.send(:prepend, server_module)
+          def web_server_module(path)
+            @web_server_module ||= super.const_get('Common')
           end
         end
       end

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

@@ -3,23 +3,10 @@ module Luban
     module Applications
       class Rack
         class Controller < Luban::Deployment::Application::Controller
-          using Luban::CLI::CoreRefinements
-
           include Luban::Deployment::Service::Controller::Cluster
           include Paths
           include Parameters
-
-          def release_matched?
-            release_tag =~ /^#{Regexp.escape(application_version)}/
-          end
-
-          def release_tag
-            @release_tag ||= release_path.basename
-          end
-
-          def release_path
-            @release_path ||= Pathname.new(readlink(app_path.join('app')))
-          end
+          include WebServer
 
           def restart_process(phased: false)
             if process_stopped?
@@ -46,16 +33,6 @@ module Luban
 
           protected
 
-          def init
-            load_web_server
-          end
-
-          def load_web_server
-            require_relative "web_servers/#{web_server}"
-            server_module = WebServers.const_get(web_server.camelcase)
-            singleton_class.send(:prepend, server_module)
-          end
-
           def restart_process!
             capture("#{restart_command} 2>&1")
           end

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

@@ -4,19 +4,31 @@ module Luban
       class Rack
         module Paths
           def log_file_name
-            @log_file_name ||= "#{web_server}.log"
+            @log_file_name ||= "#{web_server[:name]}.log"
           end
 
-          def pid_file_name
-            @pid_file_name ||= "#{web_server}.pid"
+          def pid_file_path(n = nil)
+            if n.nil?
+              @pid_file_path ||= pids_path.join(pid_file_name)
+            else
+              pids_path.join(pid_file_name(n))
+            end
+          end
+
+          def pid_file_name(n = nil)
+            if n.nil?
+              @pid_file_name ||= "#{web_server[:name]}.pid"
+            else
+              "#{web_server[:name]}.#{n + web_server[:opts][:port].to_i}.pid"
+            end
           end
 
           def pid_file_pattern
-            @pid_file_pattern ||= "#{web_server}.*.pid"
+            @pid_file_pattern ||= "#{web_server[:name]}.*.pid"
           end
 
           def control_file_name
-            @control_file_name ||= "#{web_server}.#{control_file_extname}"
+            @control_file_name ||= "#{web_server[:name]}.#{control_file_extname}"
           end
 
           def control_file_extname
@@ -24,7 +36,7 @@ module Luban
           end
 
           def logrotate_file_name
-            @logrotate_file_name ||= "#{web_server}.logrotate"
+            @logrotate_file_name ||= "#{web_server[:name]}.logrotate"
           end
 
           def sockets_path
@@ -36,7 +48,7 @@ module Luban
           end
 
           def socket_file_name
-            @socket_file_name ||= "#{web_server}.sock"
+            @socket_file_name ||= "#{web_server[:name]}.sock"
           end
 
           def ruby_bin_path

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

@@ -1,6 +1,6 @@
 # Thin logrotate configuration
 
-<%= log_path.join('thin*.log') %> {
+<%= log_path.join('thin.*.log') %> {
   daily
   missingok
   rotate 14

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

@@ -1,14 +1,21 @@
 # Monit Monit configuration for Thin
 
-check process <%= service_entry %>
-  with pidfile <%= pid_file_path %>
-  start program = "/bin/bash -c 'sleep 1; <%= start_command %>'"
-  stop program = "/bin/bash -c '<%= stop_command %>'"
+<% opts = web_server[:opts] -%>
+<% opts[:servers].times do |n| -%>
+check process <%= service_entry %>.<%= web_server[:name] %>.<%= n %>
+  with pidfile <%= pid_file_path(n) %>
+  group <%= service_entry %>
+  onreboot laststate
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %> -o <%=n %>'"
+  stop program = "/bin/bash -c '<%= stop_command %> -o <%=n %>'"
   if totalmem is greater than 150.0 MB for 40 cycles then alert
-  if failed port 3000 for 4 times within 8 cycles then restart
-  if failed port 3001 for 4 times within 8 cycles then restart
-  if failed port 3002 for 4 times within 8 cycles then restart
-  if failed port 3003 for 4 times within 8 cycles then restart
-  # if failed unixsocket <%= socket_file_path %> for 4 times within 8 cycles then restart
+  <%- if opts[:port] -%>
+  if failed port <%= opts[:port].to_i + 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
+  <%- end -%>
   if cpu is greater than 80% for 20 cycles then alert
   if loadavg(5min) greater than 10 for 40 cycles then alert
+
+<% end -%>

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

@@ -1,27 +1,4 @@
 ---
-# Server options
-# address: 0.0.0.0
-# port: 3000
-# socket: <%= socket_file_path %>
-chdir: <%= release_path %>
-
-# Adapter options
-environment: <%= stage %>
-
-# Daemon options
-daemonize: true
-log: <%= log_file_path %>
-pid: <%= pid_file_path %>
-tag: <%= "#{env_name}:#{release_tag}" %>
-
-# Cluster options
-servers: 4
-wait: 30
-
-# Tuning options
-# timeout: 30
-# max_conns: 1024
-# max_persistent_conns: 100
-
-# Common options
-# trace: true
+<% web_server[:opts].each_pair do |key, value| -%>
+  <%= key %>: <%= value.inspect %>
+<% end %>

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

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

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

@@ -0,0 +1,45 @@
+module Luban
+  module Deployment
+    module Applications
+      class Rack
+        module WebServer
+          using Luban::CLI::CoreRefinements
+
+          def default_web_server_options
+            raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+          end
+
+          protected
+
+          def init
+            load_web_server
+          end
+
+          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
+
+          def web_server_require_path
+            @web_server_require_path ||= web_server_require_root.join(web_server[:name].to_s)
+          end
+
+          def web_server_require_root
+            @web_server_require_root ||= Pathname.new("luban/deployment/applications/rack/web_servers")
+          end
+
+          def web_server_module(path)
+            @web_server_module ||= Object.const_get(path.to_s.camelcase, false)
+          end
+
+          def set_default_web_server_options
+            web_server[:opts] = default_web_server_options.merge(web_server[:opts])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,32 @@ module Luban
         module WebServers
           module Thin
             module Common
+              def default_web_server_options
+                @default_web_server_options ||= {
+                  # Server options
+                  address: "0.0.0.0",
+                  port: 3000,
+                  socket: socket_file_path.to_s,
+                  chdir: release_path.to_s,
+                  # Adapter options
+                  environment: stage,
+                  # Daemon options
+                  daemonize: true,
+                  log: log_file_path.to_s,
+                  pid: pid_file_path.to_s,
+                  tag: "#{env_name}:#{release_tag}",
+                  # Cluster options
+                  servers: 4,
+                  wait: 30,
+                  # Tuning options
+                  timeout: 30,
+                  max_conns: 1024,
+                  max_persistent_conns: 100,
+                  # Common options
+                  trace: true
+                }
+              end
+
               def control_file_extname
                 @control_file_extname ||= "yml"
               end
@@ -24,6 +50,19 @@ module Luban
               def process_pattern
                 @process_pattern ||= "^thin server.+\\[#{Regexp.escape(env_name)}:#{Regexp.escape(application_version)}-[0-9a-f]+\\]"
               end
+
+              protected
+
+              def set_default_web_server_options
+                super.tap do |opts|
+                  if opts.delete(:unix_socket)
+                    opts.delete(:address)
+                    opts.delete(:port)
+                  else
+                    opts.delete(:socket)
+                  end
+                end
+              end
             end
 
             include Common

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

@@ -1,6 +1,7 @@
 require 'luban'
 require_relative 'rack/base'
 require_relative 'rack/paths'
+require_relative 'rack/web_server'
 require_relative 'rack/controller'
 require_relative 'rack/configurator'
 require_relative 'rack/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -92,6 +92,7 @@ files:
 - lib/luban/deployment/applications/rack/templates/thin/thin.monitrc.erb
 - lib/luban/deployment/applications/rack/templates/thin/thin.yml.erb
 - lib/luban/deployment/applications/rack/version.rb
+- lib/luban/deployment/applications/rack/web_server.rb
 - lib/luban/deployment/applications/rack/web_servers/thin.rb
 - lib/luban/rack.rb
 - luban-rack.gemspec