poise-monit 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ff0116df0ba8f85dd624148cfbf3439b3189d3
-  data.tar.gz: 34f52b07a049dbcd0b40955cb7b27453c07670a8
+  metadata.gz: 5910f2212aae422952d183c3181c7a9f16ba7645
+  data.tar.gz: be58c2407526be1cfdc0f618898c18b1333447a9
 SHA512:
-  metadata.gz: 761460bd6768bedb0a30a33f048004b1939a6ee02fc2bcccb6466588d69cf09c412dc7b006db94724e80fe918734e7d19b6694e81b74e053a5114835f1979ecf
-  data.tar.gz: 5b06b17af6e9411ac51004ed178650502a953bc22bdaf739850644db925973207097c645cae495b86f7c4be6c0197b37f558cbcea18ea4ef0209695ffbecbcef
+  metadata.gz: a72322971a42e15e31d8c6c5008d1186b4b66bf38a4f7339a0cfaf2a5a069267077d2c228b1308a82a99f2f42adbf680de67e48b1dcbc9bed2a34cb3e09cf633
+  data.tar.gz: 7918da029cf7e55e252f69cf166e66998bdefe6939bc8b8a90209990b40b189b33bca84f1decc79abb776fba327713a9851f8fadc76d4b762793834cff126e56

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Monit Changelog
 
+## v1.4.0
+
+* Allow tuning the timeout and wait for `monit_service` via node attributes.
+
 ## v1.3.0
 
 * More complete `:dummy` provider for weird install conditions.

data/README.md

@@ -261,6 +261,13 @@ end
 
 To set the `monit` provider as the global default, use [`poise-sevice-monit`](https://github.com/poise/poise-service-monit).
 
+The service provider has two node attributes that can used for global tuning:
+
+* `node['poise-monit']['monit_service_timeout']` – Seconds before timeout when
+  registering a new service with Monit. *(default: 20)*
+* `node['poise-monit']['monit_service_wait']` – Seconds to wait between attempts
+  when registering a new service with Monit. *(default: 1)*
+
 ## Upgrading From `monit`
 
 Upgrading from the older [`monit` cookbook](https://github.com/poise/poise-monit-compat)

data/chef/attributes/default.rb

@@ -14,6 +14,11 @@
 # limitations under the License.
 #
 
+# Seconds before timeout when registering a new service with Monit.
+default['poise-monit']['monit_service_timeout'] = 20
+# Seconds to wait between attempts when registering a new service with Monit.
+default['poise-monit']['monit_service_wait'] = 1
+
 # Recipe to include when a parent is needed for poise_service.
 default['poise-monit']['default_recipe'] = 'poise-monit'
 

data/lib/poise_monit/resources/monit_service.rb

@@ -31,11 +31,6 @@ module PoiseMonit
       # Value from monit action subcommands that mean the service doesn't exist.
       NO_SERVICE_ERROR = /There is no service/
 
-      # Default time to wait for a monit command to succeed.
-      DEFAULT_TIMEOUT = 20
-      # Default time to sleep between tries.
-      DEFAULT_WAIT = 1
-
       # A `monit_service` resource to control Monit-based services.
       #
       # @provides monit_service
@@ -175,7 +170,7 @@ module PoiseMonit
           status_cmd.stdout =~ re && $1
         end
 
-        def monit_shell_out!(monit_cmd, timeout: DEFAULT_TIMEOUT, wait: DEFAULT_WAIT, &block)
+        def monit_shell_out!(monit_cmd, timeout: node['poise-monit']['monit_service_timeout'], wait: node['poise-monit']['monit_service_wait'], &block)
           while true
             cmd_args = [new_resource.parent.monit_binary]
             cmd_args << '-v' if (defined?(new_resource.monit_verbose) && new_resource.monit_verbose) || Chef::Log.level == :debug

data/lib/poise_monit/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseMonit
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/test/spec/resources/monit_service_spec.rb

@@ -31,8 +31,9 @@ describe PoiseMonit::Resources::MonitService do
     allow(File).to receive(:exist?).with('/exists').and_return(true)
     allow(File).to receive(:exist?).with('/not_exists').and_return(false)
     # Override these so our tests don't take forever.
-    stub_const('PoiseMonit::Resources::MonitService::DEFAULT_TIMEOUT', 1)
-    stub_const('PoiseMonit::Resources::MonitService::DEFAULT_WAIT', 0)
+    override_attributes['poise-monit'] ||= {}
+    override_attributes['poise-monit']['monit_service_timeout'] = 2
+    override_attributes['poise-monit']['monit_service_wait'] = 0.01
     # Status for simple cases.
     stub_status(status) if status
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-monit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite