From: paulfantom <paulfantom@gmail.com>
Date: Fri, 17 Jun 2016 15:01:54 +0000 (+0200)
Subject: fix variable naming in tomcat.chart.sh
X-Git-Tag: v1.3.0~122^2
X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=commitdiff_plain;h=70e2d2feb380d3ae43e9b89e10cea721c30260ac

fix variable naming in tomcat.chart.sh
---

diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
index b0eddc7f..50a17e2b 100755
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -9,8 +9,8 @@ tomcat_url=""
 tomcat_curl_opts=""
 
 # set tomcat username/password here
-tomcatUser=""
-tomcatPassword=""
+tomcat_user=""
+tomcat_password=""
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
@@ -37,13 +37,23 @@ tomcat_check() {
 	  	echo >&2 "tomcat url is unset or set to the empty string"
 		return 1
 	fi
-	if [ -z "${tomcatUser}" ]; then
-    	  	echo >&2 "tomcat user is unset or set to the empty string"
-		return 1
+	if [ -z "${tomcat_user}" ]; then
+		# check backwards compatibility
+		if [ -z "${tomcatUser}" ]; then		
+    	  		echo >&2 "tomcat user is unset or set to the empty string"
+			return 1
+		else
+			tomcat_user="${tomcatUser}"
+		fi
 	fi
-	if [ -z "${tomcatPassword}" ]; then
-    	  	echo >&2 "tomcat password is unset or set to the empty string"
-		return 1
+	if [ -z "${tomcat_password}" ]; then
+		# check backwards compatibility
+		if [ -z "${tomcatPassword}" ]; then
+	    	  	echo >&2 "tomcat password is unset or set to the empty string"
+			return 1
+		else
+			tomcat_password="${tomcatPassword}"
+		fi
 	fi
 
 	# check if we can get to tomcat's status page
@@ -65,7 +75,7 @@ tomcat_check() {
 tomcat_get() {
 	# collect tomcat values
 	tomcat_port="$(IFS=/ read -ra a <<< "$tomcat_url"; hostport=${a[2]}; echo "${hostport#*:}")"
-	mapfile -t lines < <(curl -u "$tomcatUser":"$tomcatPassword" -Ss ${tomcat_curl_opts} "$tomcat_url" |\
+	mapfile -t lines < <(curl -u "$tomcat_user":"$tomcat_password" -Ss ${tomcat_curl_opts} "$tomcat_url" |\
 		xmlstarlet sel \
 			-t -m "/status/jvm/memory" -v @free \
 			-n -m "/status/connector[@name='\"http-bio-$tomcat_port\"']/threadInfo" -v @currentThreadCount \