luban-nginx 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56320d742c77de9f7c3f5940849211f958500de
-  data.tar.gz: 74ffd91524d3a5b4f8789d12bf16abbcabc43166
+  metadata.gz: 6eebed13089ab8504ba7fad7fe505ee0e0a07dad
+  data.tar.gz: 333d8d4b66ec26f7428fbe5b426236ce2d1ce6d9
 SHA512:
-  metadata.gz: a446438849629953e9d6cbc3f31fe566e28fe1d48084dcdb03fbf4ef9293b618729d9d97bfbe9430492a159a5d327e611aef3f0753ba612a6d6abbb4546acaff
-  data.tar.gz: d8f32737378e85caf57457340280bf81825660670e50002f7730bc3871f3a5a571f4f25eb292cbdb25c59aa1c18c9794e36c3267f5119fe56af331c63a03ce50
+  metadata.gz: 5c1424e41aa0650d9edf1eac6cdeb215655eeb2c550dc95e49988b336396687bb1f48b7cc000b7e96c2108800b662ff9582f7d664591c95fbc262fbfc673dc33
+  data.tar.gz: d03f27e9781ffe8cda82c8916e21d7eaff94c32744acc40a1e90133098d2a24f4f9657b4aa020caa331d0639af35eec8bb0a77a9a116b547b4c735cb89986d60

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change log
 
+## Version 0.1.1 (Jun 16, 2016)
+
+Minor enhancements:
+  * Refatored commands definitions for better reusability among service workers
+  * Simplified erb templates by removing header information like revision, environment, etc.
+    * Header info is generated by Luban (with a generic header template which could be customized if needed)
+
 ## Version 0.1.0 (May 11, 2016)
 
 New features:

data/lib/luban/deployment/packages/nginx.rb

@@ -1,7 +1,7 @@
 require 'luban'
 require_relative 'nginx/base'
-require_relative 'nginx/configurator'
 require_relative 'nginx/controller'
+require_relative 'nginx/configurator'
 require_relative 'nginx/installer'
 require_relative 'nginx/version'
 

data/lib/luban/deployment/packages/nginx/configurator.rb

@@ -3,13 +3,7 @@ module Luban
     module Packages
       class Nginx
         class Configurator < Luban::Deployment::Service::Configurator
-          module Paths
-            def bin_path
-              @bin_path ||= install_path.join('sbin')
-            end
-          end
-
-          include Paths
+          include Controller::Commands
 
           def error_log_file_path
             @error_log_file_path ||= log_path.join(error_log_file_name)
@@ -31,9 +25,7 @@ module Luban
               if file?(stage_profile_path.join(mime_types_file_name))
                 profile_path.join(mime_types_file_name)
               else
-                #Pathname.new('conf').join(mime_types_file_name)
                 current_path.join('conf').join(mime_types_file_name)
-                #install_path.join('conf').join(mime_types_file_name)
               end
           end
 

data/lib/luban/deployment/packages/nginx/controller.rb

@@ -3,17 +3,33 @@ module Luban
     module Packages
       class Nginx
         class Controller < Luban::Deployment::Service::Controller
-          include Configurator::Paths
+          module Commands
+            def self.included(base)
+              base.define_executable 'nginx'
+            end
+
+            def bin_path
+              @bin_path ||= install_path.join('sbin')
+            end
+
+            def nginx_command
+              @nginx_command ||= "#{nginx_executable} -c #{control_file_path}"
+            end
 
-          default_executable 'nginx'
+            alias_method :process_pattern, :nginx_command
+            alias_method :start_command, :nginx_command
 
-          def nginx_command
-            @nginx_command ||= "#{nginx_executable} -c #{control_file_path}"
+            def stop_command
+              @stop_command ||= "#{nginx_command} -s stop"
+            end
           end
-          alias_method :process_pattern, :nginx_command
 
-          def config_test
-            update_result config_test!
+          include Commands
+
+          %w(config_test reload_process reopen_logs).each do |method|
+            define_method(method) do
+              update_result send("#{method}!")
+            end
           end
 
           def quit_process
@@ -22,9 +38,9 @@ module Luban
               return
             end
 
+            unmonitor_process
             output = quit_process!
             if check_until { process_stopped? }
-              unmonitor_process
               update_result "Gracefully stop #{package_full_name}: [OK] #{output}"
             else
               remove_orphaned_pid_file
@@ -33,34 +49,16 @@ module Luban
             end
           end
 
-          def before_quit; unmonitor_process; end
-
-          def reload_process
-            update_result reload_process!
-          end
-
-          def reopen_logs
-            update_result reopen_logs!
-          end
-
           protected
 
           def config_test!
             capture("#{nginx_command} -t 2>&1")
           end
 
-          def start_process!
-            capture("#{nginx_command} 2>&1")
-          end
-
           def quit_process!
             capture("#{nginx_command} -s quit 2>&1")
           end
 
-          def stop_process!
-            capture("#{nginx_command} -s stop 2>&1")
-          end
-
           def reload_process!
             capture("#{nginx_command} -s reload 2>&1")
           end
@@ -72,4 +70,4 @@ module Luban
       end
     end
   end
-end
+end

data/lib/luban/deployment/packages/nginx/installer.rb

@@ -3,9 +3,7 @@ module Luban
     module Packages
       class Nginx
         class Installer < Luban::Deployment::Service::Installer
-          include Configurator::Paths
-
-          default_executable 'nginx'
+          include Controller::Commands
 
           def source_repo
             @source_repo ||= "http://nginx.org"
@@ -49,4 +47,4 @@ module Luban
       end
     end
   end
-end
+end

data/lib/luban/deployment/packages/nginx/templates/nginx.conf.erb

@@ -1,9 +1,5 @@
 # Nginx master configuration file
 
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
-
 pid <%= pid_file_path %>;
 error_log <%= error_log_file_path %> info;
 

data/lib/luban/deployment/packages/nginx/templates/nginx.http.conf

@@ -40,4 +40,4 @@ proxy_redirect off;
 # -------------------------------------
 log_format main '$remote_addr - $remote_user [$time_local] $status '
                 '"$request" $body_bytes_sent "$http_referer" '
-                '"$http_user_agent" "$http_x_forwarded_for" "$request_time"';
+                '"$http_user_agent" "$http_x_forwarded_for" "$request_time"';

data/lib/luban/deployment/packages/nginx/templates/nginx.http.proxy.conf

@@ -1,9 +1,5 @@
 # Nginx reverse proxy configuration
 
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
-
 upstream <%= serivce_entry %> {
     # fail_timeout=0 means we always retry an upstream even if it failed
     # to return a good HTTP response (in case the Puma master nukes a

data/lib/luban/deployment/packages/nginx/templates/nginx.logrotate.erb

@@ -1,9 +1,5 @@
 # Nginx logrotate configuration
 
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
-
 <%= log_path.join('*.log') %> {
   daily
   missingok

data/lib/luban/deployment/packages/nginx/templates/nginx.monitrc.erb

@@ -1,15 +1,10 @@
 # Monit control file for Nginx
 
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
-
-<% nginx_command = "#{bin_path.join('nginx')} -c #{control_file_path}" %>
 check process <%= service_entry %>
   with pidfile <%= pid_file_path %>
-  start program = "/bin/bash -c 'sleep 1; <%= nginx_command %>'"
-  stop program = "/bin/bash -c '<%= "#{nginx_command} -s stop" %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %>'"
+  stop program = "/bin/bash -c '<%= stop_command %>'"
   if totalmem is greater than 10.0 MB for 40 cycles then restart
-  if failed port 8080 for 3 times within 6 cycles then restart
+  if failed port 8080 for 4 times within 8 cycles then restart
   if cpu is greater than 80% for 20 cycles then alert
   if loadavg(5min) greater than 10 for 40 cycles then restart

data/lib/luban/deployment/packages/nginx/version.rb

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

data/lib/luban/deployment/packages/pcre.rb

@@ -6,7 +6,7 @@ module Luban
       class Pcre < Luban::Deployment::Package::Base
         class Installer < Luban::Deployment::Package::Installer
           def pcre_executable
-            @default_executable ||= bin_path.join('pcre-config')
+            @pcre_executable ||= bin_path.join('pcre-config')
           end
 
           def source_repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-nginx
 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-06-07 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban