adding checks to make sure url, username and password are set.

diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
index fd8d33920a0646faa56c55ca11bd86f2d9e016f7..ee17d1757ec80e36426025f56a07b07afcd40a96 100755 (executable)
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -4,9 +4,10 @@
 # Author: Jorge Romero
 
 # the URL to download tomcat status info
-tomcat_url="http://localhost:8080/manager/status?XML=true"
+# usually http://localhost:8080/manager/status?XML=true
+tomcat_url=""
 
-# set tomcat user/password here
+# set tomcat username/password here
 tomcatUser=""
 tomcatPassword=""
 
@@ -29,10 +30,26 @@ tomcat_check() {
 
        require_cmd xmlstarlet || return 1
 
+
+       # check if url, username, passwords are set
+       if [ -z "${tomcat_url}" ]; then
+         echo "tomcat url is unset or set to the empty string"
+               return 1
+       fi
+       if [ -z "${tomcatUser}" ]; then
+         echo "tomcat user is unset or set to the empty string"
+               return 1
+       fi
+       if [ -z "${tomcatPassword}" ]; then
+         echo "tomcat password is unset or set to the empty string"
+               return 1
+       fi
+
+       # check if we can get to tomcat's status page
        tomcat_get
        if [ $? -ne 0 ]
                then
-               echo >&2 "tomcat: cannot find status page on URL '${tomcat_url}'. Please set tomcat_url='http://localhost:8080/manager/status?XML=true'"
+               echo >&2 "tomcat: couldn't get to status page on URL '${tomcat_url}'. Please make sure tomcat url, username and password are correct."
                return 1
        fi