From db61bd7ac8d2e5e291af715278350dd7f81565d9 Mon Sep 17 00:00:00 2001 From: sharumpe Date: Tue, 27 Jan 2015 10:42:13 -0800 Subject: [PATCH] Adding new parameters jkWorkerRetries and jkWorkerSocketTimeout to get around certain types of timeouts that cause 502 errors. --- manifests/jk.pp | 12 ++++++++---- templates/default/etc/apache2/conf.d/jk.conf.erb | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/manifests/jk.pp b/manifests/jk.pp index a088964..c496465 100644 --- a/manifests/jk.pp +++ b/manifests/jk.pp @@ -1,9 +1,11 @@ class apache2::jk ( - $jkLogLevel = "error", - $jkWorkerHost = "localhost", - $jkWorkerPort = 8009, - $apps = [] + $jkLogLevel = "error", + $jkWorkerHost = "localhost", + $jkWorkerPort = 8009, + $jkWorkerRetries = 3, + $jkWorkerSocketTimeout = 60, + $apps = [] ) { include apache2::params @@ -11,6 +13,8 @@ validate_string( $jkLogLevel ) validate_string( $jkWorkerHost ) validate_string( $jkWorkerPort ) + validate_string( $jkWorkerRetries ) + validate_string( $jkWorkerSocketTimeout ) validate_array( $apps ) # install the package diff --git a/templates/default/etc/apache2/conf.d/jk.conf.erb b/templates/default/etc/apache2/conf.d/jk.conf.erb index 544fa7e..50d71ae 100644 --- a/templates/default/etc/apache2/conf.d/jk.conf.erb +++ b/templates/default/etc/apache2/conf.d/jk.conf.erb @@ -33,9 +33,9 @@ JkWorkerProperty worker.localJvm1.type=ajp13 JkWorkerProperty worker.localJvm1.host=<%= @jkWorkerHost %> JkWorkerProperty worker.localJvm1.port=<%= @jkWorkerPort %> - JkWorkerProperty worker.localJvm1.socket_timeout=10 - JkWorkerProperty worker.localJvm1.retries=3 - JkWorkerProperty worker.localJvm1.lbfactor=50 + JkWorkerProperty worker.localJvm1.socket_timeout=<%= @jkWorkerSocketTimeout %> + JkWorkerProperty worker.localJvm1.retries=<%= @jkWorkerRetries %> + JkWorkerProperty worker.localJvm1.lbfactor=1 # Set properties for the status worker JkWorkerProperty worker.status.type=status