luban-rack 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 401673444edec353be4fdafec57295762afe901b
-  data.tar.gz: 6882a24445150e56bad3e66e435bcafd08a0d679
+  metadata.gz: 6c259256c907040be68bcc8e691d834ab91cfa6e
+  data.tar.gz: b601b76535446719c83900f707f9669aec0356c2
 SHA512:
-  metadata.gz: bc2919ae7f28b1cf8342f29b12182a8d7c9d65cc9e47b2c0ed71f93ade24299d358014989cc33d21ee74f4c62c144a87ff847b45cebb99c0d467c7d1dff403aa
-  data.tar.gz: a67412dad37c8d561809512c6004003cae56fafd528964bd0da3ad038c42bff3a7ee5e640ed311e5f34bd16c8e59ba5ce39a394219a2cf7672c95e5b1ad278b1
+  metadata.gz: d4ba2920f0c93cdd4d578beacb6c30bb59da68e2d164ab6d1c20bc78d63493b2acfe871e172deb994fead34f1d4da4170cef52728ba5010c341762432f1f1a99
+  data.tar.gz: 85bebbacc003b3fa0dba25ea98770c2170fdc89915dfae135fb0b69d72cb3123f2bc42f4960f46fa84ea2c8c9ab9985c850722664ead7d665ea3fcb01b18010d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## Version 0.2.9 (Sept 21, 2016)
+
+Bug fixes:
+  * Changed default server address to 127.0.0.1 for both Thin and Puma
+  * Changed Puma default port next to the web server port
+  * Passed the right arguments to monitor_command/unmonitor_command
+  * Checked if process is monitorable before enable/disable process monitoring
+
 ## Version 0.2.8 (Sept 20, 2016)
 
 Bug fixes:

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

@@ -13,12 +13,12 @@ module Luban
               return
             end
 
-            unmonitor_process
+            unmonitor_process if process_monitorable?
             output = (phased ? phased_restart_process! : restart_process!) || 'OK'
 
             if check_until { process_started? }
               update_result "Restart #{service_full_name}: [OK] #{output}"
-              monitor_process
+              monitor_process if process_monitorable?
             else
               remove_orphaned_pid_file
               update_result "Restart #{service_full_name}: [FAILED] #{output}",

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

@@ -8,7 +8,7 @@ check process <%= service_entry %>
   stop program = "/bin/bash -c '<%= stop_command %>'"
   if totalmem is greater than 150.0 MB for 40 cycles then alert
   <%- if tcp_socket? -%>
-  if failed port <%= opts[:port] %> for 4 times within 8 cycles then restart
+  if failed port <%= port + 1 %> for 4 times within 8 cycles then restart
   <%- end -%>
   <%- if unix_socket? -%>
   if failed unixsocket <%= socket_file_path %> for 4 times within 8 cycles then restart

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

@@ -6,7 +6,7 @@ upstream <%= service_entry %> {
     # to return a good HTTP response 
 
     <%- if tcp_socket? -%>
-    server <%= opts[:address] %>:<%= opts[:port] %> fail_timeout=0;
+    server <%= "127.0.0.1" %>:<%= port + 1 %> fail_timeout=0;
     <%- end -%>
     <%- if unix_socket? -%>
     server unix:<%= socket_file_path %> fail_timeout=0;

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

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

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

@@ -8,8 +8,8 @@ module Luban
              def default_web_server_options
                 @default_web_server_options ||= {
                   # Server options
-                  address: "0.0.0.0",
-                  port: port,
+                  address: "127.0.0.1",
+                  port: port + 1,
                   socket: socket_file_path.to_s,
                   directory: release_path.to_s,
                   environment: stage,

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

@@ -34,11 +34,11 @@ module Luban
                 rm(pid_files_path) if pid_file_orphaned?
               end
 
-              def monitor_command
+              def monitor_command(service_entry)
                 @monitor_command ||= "#{monitor_executable} monitor -g #{service_entry}"
               end
 
-              def unmonitor_command
+              def unmonitor_command(service_entry)
                 @unmonitor_command ||= "#{monitor_executable} unmonitor -g #{service_entry}"
               end
             end
@@ -88,7 +88,7 @@ module Luban
               def default_web_server_options
                 @default_web_server_options ||= {
                   # Server options
-                  address: "0.0.0.0",
+                  address: "127.0.0.1",
                   port: port + 1,
                   socket: socket_file_path.to_s,
                   chdir: release_path.to_s,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban