luban 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe10788dd7bf5d0a4fa2d6897abe9a9a33394bee
-  data.tar.gz: e04302dfd6fef080f12561301412907eb95948d6
+  metadata.gz: a1386501b0b0e2a9483089453c5c009650655097
+  data.tar.gz: fa8b1ffbe8e0e553d5b9e0f8f4ddae622b334b25
 SHA512:
-  metadata.gz: 357b44b3e16fcfea252efeacb6ac64bb12551ba6ee7c5b30ac33642590ac3cff514651d93ee2d959ec1846f09ab156aa78602e4f8c91a44376e5475e9bca0e1f
-  data.tar.gz: 0d7e5fc262a6e3eb81a11e346013c8b218f91ae97312411ac3487f1a75161b4cc9f711380c9ef3bf547aa671f31d9232a018ffa930eedff9ce7cca90eac3f1bf
+  metadata.gz: 5ee4acb1e7cd29517bbedef6c53db64e1d8ec84712427779287974178b53658dd96df0fb3e600fef79c29f78d42d4c1ae2e64a17f522c648e1f04b15be2f59f9
+  data.tar.gz: 169b0790ec7a43078499ae14d1e73c153625a0d6b31cebedd950456baa54836599b8607a81295287f1a723d950a2b53a9d9fcaf3dd10477ab399f0e252850e14

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.8.3 (Sept 21, 2016)
+
+Minor enhancements:
+  * Simplified process_monitor settings
+  * Checked if process is monitorable before any monitoring related operations
+    * thru convenient method #process_monitorable?
+  * Added control file for process monitor
+  * Used #include instead of #prepend when loading monitoring public commands
+
 ## Version 0.8.2 (Sept 20, 2016)
 
 Minor enhancements:

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

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

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

@@ -33,12 +33,26 @@ module Luban
             end
           end
 
+          def process_monitorable?
+            process_monitor_defined? and !process_monitor?
+          end
+
+          def process_monitor_defined?
+            !process_monitor[:name].nil?
+          end
+
           def process_monitor?
-            service_entry == process_monitor[:service_entry]
+            env_name == process_monitor[:env]
           end
 
           def monitor_executable
-            @monitor_executable ||= env_path.join(process_monitor[:env], 'bin', process_monitor[:name])
+            @monitor_executable ||= env_path.join(process_monitor[:env], 'bin', 
+                                                  process_monitor[:name])
+          end
+
+          def monitor_control_file_path
+            @monitor_control_file_path ||= env_path.join(process_monitor[:env], 'shared', 'profile',
+                                                         process_monitor[:name], monitor_control_file_name)
           end
 
           def start_process
@@ -50,7 +64,10 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Start #{service_full_name}: [OK] #{output}"
-              monitor_process unless process_monitor?
+              if process_monitorable?
+                reload_monitor_process
+                monitor_process 
+              end
             else
               remove_orphaned_pid_file
               update_result "Start #{service_full_name}: [FAILED] #{output}", 
@@ -64,7 +81,7 @@ module Luban
               return
             end
 
-            unmonitor_process unless process_monitor?
+            unmonitor_process if process_monitorable?
             output = stop_process! || 'OK'
             if check_until { process_stopped? }
               update_result "Stop #{service_full_name}: [OK] #{output}"
@@ -77,7 +94,7 @@ module Luban
 
           def restart_process
             if process_started?
-              unmonitor_process unless process_monitor?
+              unmonitor_process if process_monitorable?
               output = stop_process!
               if check_until { process_stopped? }
                 remove_orphaned_pid_file
@@ -93,7 +110,7 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Restart #{service_full_name}: [OK] #{output}"
-              monitor_process unless process_monitor?
+              monitor_process if process_monitorable?
             else
               remove_orphaned_pid_file
               update_result "Restart #{service_full_name}: [FAILED] #{output}", 
@@ -115,7 +132,7 @@ module Luban
               return
             end
 
-            unmonitor_process unless process_monitor?
+            unmonitor_process if process_monitorable?
             output = kill_process!
             if check_until { process_stopped? }
               update_result "Kill #{service_full_name}: [OK] #{output}"
@@ -125,37 +142,27 @@ module Luban
             remove_orphaned_pid_file
           end
 
-          def process_monitor_defined?
-            !process_monitor[:name].nil?
-          end
-
           def monitor_process
-            if process_monitor_defined?
-              if monitor_process!
-                info "Turned on process monitor for #{service_entry}"
-              else
-                info "Failed to turn on process monitor for #{service_entry}"
-              end
+            if monitor_process!
+              info "Turned on process monitor for #{service_entry}"
+            else
+              info "Failed to turn on process monitor for #{service_entry}"
             end
           end
 
           def unmonitor_process
-            if process_monitor_defined?
-              if unmonitor_process!
-                info "Turned off process monitor for #{service_entry}"
-              else
-                info "Failed to turn off process monitor for #{service_entry}"
-              end
+            if unmonitor_process!
+              info "Turned off process monitor for #{service_entry}"
+            else
+              info "Failed to turn off process monitor for #{service_entry}"
             end
           end
 
           def reload_monitor_process
-            if process_monitor_defined?
-              if reload_monitor_process!
-                info "Reloaded process monitor for #{service_entry}"
-              else
-                info "Failed to reload process monitor for #{service_entry}"
-              end
+            if reload_monitor_process!
+              info "Reloaded process monitor for #{service_entry}"
+            else
+              info "Failed to reload process monitor for #{service_entry}"
             end
           end
 
@@ -164,16 +171,12 @@ module Luban
 
           protected
 
-          def before_start_process
-            reload_monitor_process unless process_monitor?
-          end
-
           def init
-            load_process_monitor_commands
+            load_process_monitor_commands if process_monitorable?
           end
 
           def load_process_monitor_commands
-            singleton_class.send(:prepend, 
+            singleton_class.send(:include, 
               process_monitor_module.const_get("Controller::Commands::Public"))
           end
 

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Rubyist Lei
 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-cli