luban-monit 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ff6bf96ef011c09c671981ce035af92ea35956
-  data.tar.gz: 19f86daa270dbcb17215d7de1ee22f4a2eb8056f
+  metadata.gz: 68468611008e497bc3344da2a782a7f19f7b7ccd
+  data.tar.gz: 5a6f8e646155111209249abc12f025862f48d1fa
 SHA512:
-  metadata.gz: 7cd947baf88fa2336f2774c156e1e6a82b43419bf4e15a8cb3bb8e6b4d954e05a21c81ffe88c1127adb3520380fdc27b4d5cefdb73f852637f79a680c676b4a9
-  data.tar.gz: 2bbf8bbf23902668c865b8c11eb530ee98411900f2b36bc84a7edada5ceeab8c5ba7e43a30d59b348128ece4353fc252f93ddffd16220ba70c882dc40788ef25
+  metadata.gz: 8fd3eb1682b2d6af4d465568a01d2677214a8366f0075afe4c0889ef203681388667d06846d6741624e3ca03805a1fad5605e9610383eb74d2bcb79d28d4d4bb
+  data.tar.gz: 091e3e7171a422788b5746519a10c78a98efee3a5d66c31b5d0f2ff8804cd1fcfb9ca0d2c99a1cb8a55081cd03c239eb37db2e57c89cafba0a63a7c046da38d9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.2.4 (Sept 21, 2016)
+
+Minor enhancements:
+  * Explicitly specified the Monit control file path instead of the default one
+  * Minor code cleanup
+
 ## Version 0.2.3 (Sept 19, 2016)
 
 New features:

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

@@ -3,10 +3,6 @@ module Luban
     module Packages
       class Monit
         class Configurator < Luban::Deployment::Service::Configurator
-          def control_file_name
-            @control_file_name ||= 'monitrc'
-          end
-
           def state_file_path
             @state_file_path ||= pids_path.join(state_file_name)
           end

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

@@ -5,16 +5,24 @@ module Luban
         class Controller < Luban::Deployment::Service::Controller
           module Commands
             module Public
+              def monitor_control_file_name
+                @monitor_control_file_name ||= 'monitrc'
+              end
+
+              def monit_command
+                @monit_command ||= "#{monitor_executable} -c #{monitor_control_file_path}"
+              end
+
               def monitor_command(service_entry)
-                @monitor_command ||= shell_command("#{monitor_executable} monitor #{service_entry}")
+                @monitor_command ||= shell_command("#{monit_command} monitor #{service_entry}")
               end
 
               def unmonitor_command(service_entry)
-                @unmonitor_command ||= shell_command("#{monitor_executable} unmonitor #{service_entry}")
+                @unmonitor_command ||= shell_command("#{monit_command} unmonitor #{service_entry}")
               end
 
               def reload_monitor_command
-                @reload_monitor_command ||= shell_command("#{monitor_executable} reload")
+                @reload_monitor_command ||= shell_command("#{monit_command} reload")
               end
             end
 
@@ -24,11 +32,6 @@ module Luban
               base.define_executable 'monit'
             end
 
-            def monit_command
-              @monit_command ||= "#{monit_executable}"
-            end
-            alias_method :monitor_executable, :monit_command
-
             def process_pattern
               @process_pattern ||= "^#{monit_command}"
             end
@@ -44,6 +47,10 @@ module Luban
 
           include Commands
 
+          alias_method :monitor_executable, :monit_executable
+          alias_method :monitor_control_file_path, :control_file_path
+          alias_method :control_file_name, :monitor_control_file_name
+
           def process_stopped?
             super and check_process! =~ /the monit daemon is not running$/
           end

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

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Packages
       class Monit
-        VERSION = '0.2.3'
+        VERSION = '0.2.4'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-monit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 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