luban-monit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53c03f03a97b63aa892705ef24b63f394da0420
-  data.tar.gz: 6cbd637fd3477ba06eb0dccef3060a2e07980732
+  metadata.gz: 165a9d12131d359b2353e195b3aac485e0859c78
+  data.tar.gz: 005aaa6659ef4df89a21170ce92a0b11c46ce09f
 SHA512:
-  metadata.gz: 1d48c656f729349f9787c7472b7e9c4038cab312324186d86c58c673c9cda461127e1f29c17fd1106951ab3e1dbcb9c23a8faa7c9697ae8231a6844d4777380f
-  data.tar.gz: 6857f8eaccfe97ad6aa17bb99ec8678067d7a4d030dd027ac6692f64860266ccace9cdc5102252d3bf22ac9785d465d99bd49d54b3c0415986cc740135dc10d7
+  metadata.gz: e0f245fce78458ae4b3b515cd62d5af395356ba9b7c8386fe1976222a6926154d9511a1be56aa9ee7aa2a43f46fe5cd2f002421a836e6bf1c6e1d3b9ba47f500
+  data.tar.gz: 15976741e6214481642ee755eeeaf960a5aad791b8fb8547e4cba0c6a8b1ef616db1865434c5c21e41f1cdc97efa3086466bd91428da31b9f27712f1eeaaeb7a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.1.4 (Jun 07, 2016)
+
+Minor enhancements:
+  * Added two new subcommands:
+    * #config_test: Syntax check on config file
+    * #reload: reload monit deamon process
+  * Use "etc" as the default search path for control file
+  * Minor code refactoring
+
 ## Version 0.1.3 (May 13, 2016)
 
 Minor enhancements: 

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

@@ -12,6 +12,9 @@ module Luban
           @default_templates_path ||= Pathname.new(File.join(File.dirname(__FILE__), 'templates')).realpath
         end
 
+        service_action :config_test, dispatch_to: :controller
+        service_action :reload_process, dispatch_to: :controller
+
         protected
 
         def setup_install_tasks
@@ -21,8 +24,16 @@ module Luban
 
         def setup_control_tasks
           super
-          undef_task :monitor
-          undef_task :unmonitor
+
+          task :config_test do
+            desc "Syntax check on control file"
+            action! :config_test
+          end
+
+          task :reload do
+            desc "Reload process"
+            action! :reload_process
+          end
         end
       end
     end

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

@@ -3,29 +3,25 @@ module Luban
     module Packages
       class Monit
         class Configurator < Luban::Deployment::Service::Configurator
-          module Paths
-            def control_file_name
-              @control_file_name ||= 'monitrc'
-            end
-
-            def state_file_path
-              @state_file_path ||= pids_path.join(state_file_name)
-            end
+          def control_file_name
+            @control_file_name ||= 'monitrc'
+          end
 
-            def state_file_name
-              @state_file_name ||= "#{service_name}.state"
-            end
+          def state_file_path
+            @state_file_path ||= pids_path.join(state_file_name)
+          end
 
-            def id_file_path
-              @id_file_path ||= pids_path.join(id_file_name)
-            end
+          def state_file_name
+            @state_file_name ||= "#{service_name}.state"
+          end
 
-            def id_file_name
-              @id_file_name ||= "#{service_name}.id"
-            end
+          def id_file_path
+            @id_file_path ||= pids_path.join(id_file_name)
           end
 
-          include Paths
+          def id_file_name
+            @id_file_name ||= "#{service_name}.id"
+          end
 
           def services_path
             @services_path ||= env_path.join("#{stage}.*").join("*").join("shared").

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

@@ -3,27 +3,35 @@ module Luban
     module Packages
       class Monit
         class Controller < Luban::Deployment::Service::Controller
-          include Configurator::Paths
-
           default_executable 'monit'
 
           def monit_command
-            @monit_command ||= "#{monit_executable} -c #{control_file_path}"
+            @monit_command ||= "#{monit_executable}"
           end
+          alias_method :process_pattern, :monit_command
 
           def process_stopped?
-            check_process! =~ /the monit daemon is not running$/
+            super and check_process! =~ /the monit daemon is not running$/
           end
 
           def process_started?
-            check_process! =~ /^The Monit daemon #{package_major_version} uptime:/
+            super and check_process! =~ /^The Monit daemon #{package_major_version} uptime:/
+          end
+
+          def config_test
+            update_result config_test!
           end
 
-          undef_method :monitor_process
-          undef_method :unmonitor_process
+          def reload_process
+            update_result reload_process!
+          end
 
           protected
 
+          def config_test!
+            capture("#{monit_command} -t 2>&1")
+          end
+
           def start_process!
             capture("#{monit_command} 2>&1")
           end
@@ -35,6 +43,10 @@ module Luban
           def check_process!
             capture("#{monit_command} status 2>&1")
           end
+
+          def reload_process!
+            capture("#{monit_command} reload 2>&1")
+          end
         end
       end
     end

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

@@ -3,8 +3,6 @@ module Luban
     module Packages
       class Monit
         class Installer < Luban::Deployment::Service::Installer
-          include Configurator::Paths
-
           default_executable 'monit'
 
           def source_repo
@@ -22,7 +20,16 @@ module Luban
           end
 
           def with_openssl_dir(dir)
-            @configure_opts << "--with-ssl-static="#{dir}"
+            @configure_opts << "--with-ssl-static=#{dir}"
+          end
+
+          protected
+
+          def install!
+            super
+            # Symlink 'etc' to the profile path
+            # 'etc' is the default search path for control file
+            ln(profile_path, install_path.join('etc'))
           end
         end
       end

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

@@ -1,8 +1,8 @@
 # Monit logrotate configuration
 
-# Environment: <%= env_name = "#{stage}.#{project}/#{application}" %>
+# Environment: <%= env_name %>
 # Revision: <%= revision %>
-# Created at <%= Time.now().strftime("%d/%m/%Y %H:%M:%S") %>
+# Created at <%= now %>
 
 <%= log_file_path %> {
   daily

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

@@ -1,8 +1,8 @@
 # Monit control file
 
-# Environment: <%= env_name = "#{stage}.#{project}/#{application}" %>
+# Environment: <%= env_name %>
 # Revision: <%= revision %>
-# Created at <%= Time.now().strftime("%d/%m/%Y %H:%M:%S") %>
+# Created at <%= now %>
 
 set daemon 15 # Poll cycle length in seconds
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-monit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban