Skip to content

Commit 5c81088

Browse files
committed
Add poolsize back (undocumented) to help people notice they need to change things.
1 parent 8945a0d commit 5c81088

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

manifests/init.pp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
$mysql_connector_format = 'tar.gz',
7171
Stdlib::Absolutepath $mysql_connector_install = '/opt/MySQL-connector',
7272
Stdlib::HTTPUrl $mysql_connector_url = 'https://dev.mysql.com/get/Downloads/Connector-J',
73+
Optional[Integer[0]] $poolsize = undef,
7374
Optional[Integer[0]] $pool_min_size = undef,
7475
Optional[Integer[0]] $pool_max_size = undef,
7576
Optional[Integer[-1]] $pool_max_wait = undef,
@@ -174,6 +175,14 @@
174175
$jvm_extra_args_real = $jvm_extra_args
175176
}
176177

178+
# Allow some backwards compatibility;
179+
if $poolsize {
180+
deprecation('jira::poolsize', 'jira::poolsize is deprecated and simply sets max-pool-size. Please use jira::pool_max_size instead and remove this configuration')
181+
$pool_max_size_real = pick($pool_max_size, $poolsize)
182+
} else {
183+
$pool_max_size_real = $pool_max_size
184+
}
185+
177186
if $tomcat_redirect_https_port {
178187
unless ($tomcat_native_ssl) {
179188
fail('You need to set native_ssl to true when using tomcat_redirect_https_port')

templates/dbconfig.xml.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<% if $jira::pool_min_size != undef { -%>
1818
<pool-min-size><%= $jira::pool_min_size %></pool-min-size>
1919
<% } -%>
20-
<% if $jira::pool_max_size != undef { -%>
21-
<pool-max-size><%= $jira::pool_max_size %></pool-max-size>
20+
<% if $jira::pool_max_size_real != undef { -%>
21+
<pool-max-size><%= $jira::pool_max_size_real %></pool-max-size>
2222
<% } -%>
2323
<% if $jira::pool_max_idle != undef { -%>
2424
<pool-max-idle><%= $jira::pool_max_idle %></pool-max-idle>

0 commit comments

Comments
 (0)