luban 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76fee1999addcf718abd92f2c2f49ad36e0bc01
-  data.tar.gz: 21654c1dac641251e5dfcf7dbd643dd4b474f683
+  metadata.gz: 6ffbf682bcf4d234a72678f0cb42de7486a30c22
+  data.tar.gz: ff76e0eb5c9d74a9a0dec9f459d9befaeee0ea8d
 SHA512:
-  metadata.gz: c7bc4215dd7b267c2910448510f93990b2d01f3d07466e06bbd07ab1fd6c5856ea15be2443ac4033c311b1f791c8e6c7284dcfd340ab877add02cb2e8dd9b429
-  data.tar.gz: ae7e62c0cafce61eca81d3b041014c65e18550cdaca7f0800a52d0c3568c8fde901579f52895adffae1b3e696e085447ff4e5827517d7130f29d6d0194a6dd80
+  metadata.gz: 0d647cb328fe109f246babb23010fd1c464f652209090d5493bf07778bcfaaa74efd548ef3644147e2776198cae0b9f7c20fa1effc9fda11845ae9d3e4966306
+  data.tar.gz: 57de317541a53583c89e172db9b3a12e01f6e69f882319a067fb278e527e043bf305bfa76d39ea9465713dd8cf80899f64c262d0e1448fc33f7af349cc6ec4ae

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## Version 0.8.1 (Sept 20, 2016)
+
+Minor enhancements:
+  * Refactored process monitor commands
+
+Bug fixes:
+  * Fixed a typo in output redirection for /dev/null
+
 ## Version 0.8.0 (Sept 19, 2016)
 
 # New features:

data/lib/luban/deployment/cli/command.rb

@@ -103,8 +103,9 @@ module Luban
 
           def process_monitor_via(monitor, env: "uber/lubmon")
             monitor = monitor.to_s.downcase
-            env = env.to_s.downcase
-            process_monitor name: monitor, env: env
+            env = "#{stage}.#{env.to_s.downcase}"
+            process_monitor name: monitor, env: env, 
+                            service_entry: "#{env.gsub('/', '.')}.#{monitor}"
           end
 
           protected

data/lib/luban/deployment/cli/service/controller.rb

@@ -33,20 +33,12 @@ module Luban
             end
           end
 
-          def monitor_executable
-            @monitor_executable ||= env_path.join("#{stage}.#{process_monitor[:env]}", 'bin', process_monitor[:name])
-          end
-
-          def monitor_command
-            @monitor_command ||= shell_command("#{monitor_executable} monitor #{service_entry}")
+          def process_monitor?
+            service_entry == process_monitor[:service_entry]
           end
 
-          def unmonitor_command
-            @unmonitor_command ||= shell_command("#{monitor_executable} unmonitor #{service_entry}")
-          end
-
-          def reload_monitor_command
-            @reload_monitor_command ||= shell_command("#{monitor_executable} reload")
+          def monitor_executable
+            @monitor_executable ||= env_path.join(process_monitor[:env], 'bin', process_monitor[:name])
           end
 
           def start_process
@@ -58,7 +50,7 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Start #{service_full_name}: [OK] #{output}"
-              monitor_process
+              monitor_process unless process_monitor?
             else
               remove_orphaned_pid_file
               update_result "Start #{service_full_name}: [FAILED] #{output}", 
@@ -72,7 +64,7 @@ module Luban
               return
             end
 
-            unmonitor_process
+            unmonitor_process unless process_monitor?
             output = stop_process! || 'OK'
             if check_until { process_stopped? }
               update_result "Stop #{service_full_name}: [OK] #{output}"
@@ -85,7 +77,7 @@ module Luban
 
           def restart_process
             if process_started?
-              unmonitor_process
+              unmonitor_process unless process_monitor?
               output = stop_process!
               if check_until { process_stopped? }
                 remove_orphaned_pid_file
@@ -101,7 +93,7 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Restart #{service_full_name}: [OK] #{output}"
-              monitor_process
+              monitor_process unless process_monitor?
             else
               remove_orphaned_pid_file
               update_result "Restart #{service_full_name}: [FAILED] #{output}", 
@@ -123,7 +115,7 @@ module Luban
               return
             end
 
-            unmonitor_process
+            unmonitor_process unless process_monitor?
             output = kill_process!
             if check_until { process_stopped? }
               update_result "Kill #{service_full_name}: [OK] #{output}"
@@ -173,7 +165,20 @@ module Luban
           protected
 
           def before_start_process
-            reload_monitor_process
+            reload_monitor_process unless process_monitor?
+          end
+
+          def init
+            load_process_monitor_commands
+          end
+
+          def load_process_monitor_commands
+            singleton_class.send(:prepend, 
+              process_monitor_module.const_get("Controller::Commands::Public"))
+          end
+
+          def process_monitor_module
+            Luban::Deployment::Package::Base.package_class(process_monitor[:name])
           end
 
           def check_until(pending_seconds: default_pending_seconds, 
@@ -225,11 +230,11 @@ module Luban
           end
 
           def monitor_process!
-            test(monitor_command)
+            test(monitor_command(service_entry))
           end
 
           def unmonitor_process!
-            test(unmonitor_command)
+            test(unmonitor_command(service_entry))
           end
 
           def reload_monitor_process!

data/lib/luban/deployment/cli/service/worker.rb

@@ -20,7 +20,7 @@ module Luban
             when :stdout
               "2>&1"
             when nil
-              ">> /dev/null 2>&1"
+              "> /dev/null 2>&1"
             when ""
               ""
             else

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli