Skip to content

Commit a505637

Browse files
authored
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…
2 parents 9e38d63 + eed96d8 commit a505637

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,8 @@ vendor/
4646
.vagrant/
4747
.vagrant.d/
4848
.kitchen/
49+
50+
#github
51+
.bundle/
52+
.github/
53+
bin/

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
This file is used to list changes made in each version of the iis cookbook.
44

5+
## v4.1.9 (2016-06-26)
6+
7+
- Resolves [Add deprecation warnings for iis_config in 4.2](https://github.com/chef-cookbooks/iis/issues/284)
8+
- Resolves [iis_pool is not idempotent when recycle_at_time is specified and is not changed](https://github.com/chef-cookbooks/iis/issues/279)
9+
510
## v4.1.8 (2016-04-15)
611

712
- Fixed smp_processor_affinity_mask throwing deprecation warnings

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
license 'Apache 2.0'
55
description 'Installs/Configures Microsoft Internet Information Services'
66
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7-
version '4.1.8'
7+
version '4.1.9'
88
supports 'windows'
99
depends 'windows', '>= 1.34.6'
1010
source_url 'https://github.com/chef-cookbooks/iis' if respond_to?(:source_url)

providers/config.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727

2828
# :config deprecated, use :set instead
2929
action :config do
30+
Chef::Log.warn <<-eos
31+
Use of action `:config` in resource `iis_config` is now deprecated and will be removed in a future release (v4.2.0).
32+
`:set` should be used instead.
33+
eos
3034
new_resource.updated_by_last_action(true) if config
3135
end
3236

providers/pool.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def configure
236236
configure_application_pool(is_new_ping_response_time, "processModel.pingResponseTime:#{new_resource.ping_response_time}")
237237

238238
node_array = XPath.match(doc.root, 'APPPOOL/add/recycling/periodicRestart/schedule/add')
239-
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?)
239+
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?)
240240

241241
# recycling items
242242
## Special case this collection removal for now.

0 commit comments

Comments
 (0)