Merge pull request #283 from chef-cookbooks/bug-recycle_at_time

iis_pool is not idempotent when recycle_at_time is specified and is n…
sous-chefs · Jun 27, 2016 · a505637 · a505637
2 parents 9e38d63 + eed96d8
commit a505637
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,8 @@ vendor/
 .vagrant/
 .vagrant.d/
 .kitchen/
+
+#github
+.bundle/
+.github/
+bin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file is used to list changes made in each version of the iis cookbook.
 
+## v4.1.9 (2016-06-26)
+
+- Resolves [Add deprecation warnings for iis_config in 4.2](https://github.com/chef-cookbooks/iis/issues/284)
+- Resolves [iis_pool is not idempotent when recycle_at_time is specified and is not changed](https://github.com/chef-cookbooks/iis/issues/279)
+
 ## v4.1.8 (2016-04-15)
 
 - Fixed smp_processor_affinity_mask throwing deprecation warnings

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures Microsoft Internet Information Services'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '4.1.8'
+version '4.1.9'
 supports 'windows'
 depends 'windows', '>= 1.34.6'
 source_url 'https://github.com/chef-cookbooks/iis' if respond_to?(:source_url)

diff --git a/providers/config.rb b/providers/config.rb
@@ -27,6 +27,10 @@
 
 # :config deprecated, use :set instead
 action :config do
+  Chef::Log.warn <<-eos
+    Use of action `:config` in resource `iis_config` is now deprecated and will be removed in a future release (v4.2.0).
+    `:set` should be used instead.
+    eos
   new_resource.updated_by_last_action(true) if config
 end
 

diff --git a/providers/pool.rb b/providers/pool.rb
@@ -236,7 +236,7 @@ def configure
     configure_application_pool(is_new_ping_response_time, "processModel.pingResponseTime:#{new_resource.ping_response_time}")
 
     node_array = XPath.match(doc.root, 'APPPOOL/add/recycling/periodicRestart/schedule/add')
-    should_clear_apppool_schedules = ((new_resource.recycle_at_time && is_new_recycle_at_time) || !node_array.empty?) || (new_resource.recycle_schedule_clear && !node_array.empty?)
+    should_clear_apppool_schedules = ((new_resource.recycle_at_time && is_new_recycle_at_time) && !node_array.empty?) || (new_resource.recycle_schedule_clear && !node_array.empty?)
 
     # recycling items
     ## Special case this collection removal for now.