diff --git a/Modular Scripts/Tomcat/configure-linux.sh b/Modular Scripts/Tomcat/configure-linux.sh
new file mode 100644
index 0000000..45d3c16
--- /dev/null
+++ b/Modular Scripts/Tomcat/configure-linux.sh	
@@ -0,0 +1,342 @@
+#!/bin/bash
+
+##########  Variable Declarations - Start  ##########
+
+#name of the current script. This will get overwritten by the child script which calls this
+SCRIPT_NAME=configure-linux.sh
+#version of the current script. This will get overwritten by the child script which calls this
+SCRIPT_VERSION=1.0
+#minimum version of syslog to enable logging to loggly
+MIN_SYSLOG_VERSION=5.8.0
+
+#application tag. This will get overwritten by the child script which calls this
+APP_TAG=
+
+#directory location for syslog
+SYSLOG_ETCDIR_CONF=/etc/rsyslog.d
+#name and location of loggly syslog file
+LOGGLY_SYSLOG_CONFFILE=$SYSLOG_ETCDIR_CONF/22-loggly.conf
+#syslog directory
+SYSLOG_DIR=/var/spool/rsyslog
+
+#this variable will hold the host name
+HOST_NAME=
+#this variable will hold the name of the linux distribution
+LINUX_DIST=
+
+#this variable will hold the users syslog version
+SYSLOG_VERSION=
+
+#host name for logs-01.loggly.com
+LOGS_01_HOST=logs-01.loggly.com
+LOGS_01_URL=https://$LOGS_01_HOST
+#this variable will contain loggly account url in the format
+#https://$LOGGLY_ACCOUNT.loggly.com
+LOGGLY_ACCOUNT_URL=
+#loggly.com URL
+LOGGLY_COM_URL=https://www.loggly.com
+
+######Inputs provided by user######
+#this variable will hold the loggly account name provided by user.
+#this is a mandatory input
+LOGGLY_ACCOUNT=
+#this variable will hold the loggly authentication token provided by user.
+#this is a mandatory input
+LOGGLY_AUTH_TOKEN=
+#this variable will hold if debug is enabled by the user.
+#this option is not used at present
+LOGGLY_DEBUG=
+#this variable will identify if the user has selected to rollback settings
+LOGGLY_ROLLBACK=
+#this variable will hold the user name provided by user
+#this is a mandatory input
+LOGGLY_USERNAME=
+#this variable will hold the password provided by user
+#this is a mandatory input
+LOGGLY_PASSWORD=
+
+#Instruction link on how to configure loggly on linux manually. This will get overwritten by the child script which calls this
+#on how to configure the child application
+MANUAL_CONFIG_INSTRUCTION="Manual instructions to configure rsyslog on Linux is available at https://www.loggly.com/docs/rsyslog-manual-configuration/"
+##########  Variable Declarations - End  ##########
+
+#sets linux variables which will be used across various functions
+setLinuxVariables()
+{
+	#set host name
+	HOST_NAME=$(hostname)
+
+	#set value for linux distribution name
+	LINUX_DIST=$(lsb_release -ds)
+
+	if [ $? -ne 0 ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script."
+		exit 1
+	else
+		#remove double quotes (if any) from the linux distribution name
+		LINUX_DIST="${LINUX_DIST%\"}"
+		LINUX_DIST="${LINUX_DIST#\"}"
+		case "$LINUX_DIST" in
+			*"Ubuntu"* )
+			echo "INFO: Operating system is Ubuntu."
+			;;
+			*"Red Hat"* )
+			echo "INFO: Operating system is Red Hat."
+			;;
+			*"CentOS"* )
+			echo "INFO: Operating system is CentOS."
+			;;
+			* )
+			logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script."
+			exit 1
+			;;
+		esac
+	fi
+
+	#set loggly account url
+	LOGGLY_ACCOUNT_URL=https://$LOGGLY_ACCOUNT.loggly.com
+}
+
+#compares two version numbers, used for comparing versions of various softwares
+compareVersions ()
+{
+	typeset    IFS='.'
+	typeset -a v1=( $1 )
+	typeset -a v2=( $2 )
+	typeset    n diff
+
+	for (( n=0; n<$3; n+=1 )); do
+	diff=$((v1[n]-v2[n]))
+	if [ $diff -ne 0 ] ; then
+		[ $diff -le 0 ] && echo '-1' || echo '1'
+		return
+	fi
+	done
+	echo  '0'
+}
+
+
+#checks if all the various endpoints used for configuring loggly are accessible
+checkLogglyServersAccessiblilty()
+{
+	echo "INFO: Checking if $LOGGLY_ACCOUNT_URL is reachable"
+	if [ $(curl -s --head  --request GET $LOGGLY_ACCOUNT_URL/login | grep "200 OK" | wc -l) == 1 ]; then
+		echo "INFO: $LOGGLY_ACCOUNT_URL is reachable"
+	else
+		logMsgToConfigSysLog "WARNING" "WARNING: $LOGGLY_ACCOUNT_URL is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system."
+	fi
+
+	echo "INFO: Checking if $LOGS_01_HOST is reachable"
+	if [ $(ping -c 1 $LOGS_01_HOST | grep "1 packets transmitted, 1 received, 0% packet loss" | wc -l) == 1 ]; then
+		echo "INFO: $LOGS_01_HOST is reachable"
+	else
+		logMsgToConfigSysLog "WARNING" "WARNING: $LOGS_01_HOST is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system."
+	fi
+
+	echo "INFO: Checking if provided username and password is correct"
+	if [ $(curl -s -u $LOGGLY_USERNAME:$LOGGLY_PASSWORD $LOGGLY_ACCOUNT_URL/apiv2/customer | grep "Unauthorized" | wc -l) == 1 ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: Invalid Loggly username or password."
+		exit 1
+	else
+		logMsgToConfigSysLog "INFO" "INFO: Username and password authorized successfully."
+	fi
+}
+
+# executing the script for loggly to install and configure syslog.
+configureLogglyForLinux()
+{
+	checkIfUserHasRootPrivileges
+	setLinuxVariables
+	logMsgToConfigSysLog "INFO" "INFO: Initiating Configure Loggly for Linux."
+	checkLogglyServersAccessiblilty
+
+	sudo service rsyslog start
+	SYSLOG_VERSION=$(sudo rsyslogd -version | grep "rsyslogd")
+	SYSLOG_VERSION=${SYSLOG_VERSION#* }
+	SYSLOG_VERSION=${SYSLOG_VERSION%,*}
+	SYSLOG_VERSION=$SYSLOG_VERSION | tr -d " "
+	if [ $(compareVersions $SYSLOG_VERSION $MIN_SYSLOG_VERSION 3) -lt 0 ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: Min syslog version required is 5.8.0."
+		exit 1
+	fi
+
+	echo "INFO: Checking if loggly sysconf file $LOGGLY_SYSLOG_CONFFILE exist"
+	# if the loggly configuration file exist, then don't create it.
+	if [ -f "$LOGGLY_SYSLOG_CONFFILE" ]; then
+		logMsgToConfigSysLog "INFO" "INFO: Loggly syslog file $LOGGLY_SYSLOG_CONFFILE exist, not creating file."
+	else
+		logMsgToConfigSysLog "INFO" "INFO: Creating file $LOGGLY_SYSLOG_CONFFILE"
+		if [ "$LOGGLY_ACCOUNT" != "" ]; then
+			wget -q -O - $LOGGLY_COM_URL/install/configure-syslog.py | sudo python - setup --auth $LOGGLY_AUTH_TOKEN --account $LOGGLY_ACCOUNT
+		else
+			logMsgToConfigSysLog "ERROR" "ERROR: Loggly auth token is required to configure rsyslog. Please pass -a <auth token> while running script."
+			exit 1
+		fi
+	fi
+
+	# Create rsyslog dir if it doesn't exist, Modify the rsyslog directory if exist
+	if [ -d "$SYSLOG_DIR" ]; then
+		logMsgToConfigSysLog "INFO" "INFO: $SYSLOG_DIR exist, not creating dir."
+		if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
+			logMsgToConfigSysLog "INFO" "INFO: Changing the permission on the rsyslog in /var/spool."
+			sudo chown -R syslog:adm $SYSLOG_DIR
+		fi
+	else
+		logMsgToConfigSysLog "INFO" "INFO: Creating directory $SYSLOGDIR."
+		sudo mkdir -v $SYSLOG_DIR
+		 if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
+			sudo chown -R syslog:adm $SYSLOG_DIR
+		fi
+	fi
+	
+	logMsgToConfigSysLog "SUCCESS" "SUCCESS: Linux system successfully configured to send logs via Loggly."
+
+}
+# End of configure rsyslog for linux
+
+
+#restart syslog
+restartsyslog()
+{
+	logMsgToConfigSysLog "INFO" "INFO: Restarting the rsyslog service."
+	sudo service rsyslog restart
+	if [ $? -ne 0 ]; then
+		logMsgToConfigSysLog "WARNING" "WARNING: rsyslog did not restart gracefully. Please restart rsyslog manually."
+	fi
+}
+
+#logs message to config syslog
+logMsgToConfigSysLog()
+{
+	#$1 variable will be SUCCESS or ERROR or INFO or WARNING
+	#$2 variable will be the message
+	cslStatus=$1
+	cslMessage=$2
+	echo "$cslMessage"
+	currentTime=$(date)
+
+	#for Linux system, we need to use -d switch to decode base64 whereas
+	#for Mac system, we need to use -D switch to decode
+	varUname=$(uname)
+	if [[ $varUname == 'Linux' ]]; then
+		enabler=$(echo MWVjNGU4ZTEtZmJiMi00N2U3LTkyOWItNzVhMWJmZjVmZmUw | base64 -d)
+	elif [[ $varUname == 'Darwin' ]]; then
+		enabler=$(echo MWVjNGU4ZTEtZmJiMi00N2U3LTkyOWItNzVhMWJmZjVmZmUw | base64 -D)
+	fi
+
+	if [ $? -ne 0 ]; then
+        echo  "ERROR: Base64 decode is not supported on your Operating System. Please update your system to support Base64."
+        exit 1
+	fi
+
+	sendPayloadToConfigSysLog "$cslStatus" "$cslMessage" "$enabler"
+
+	#if it is an error, then log message "Script Failed" to config syslog and exit the script
+	if [[ $cslStatus == "ERROR" ]]; then
+		sendPayloadToConfigSysLog "ERROR" "Script Failed" "$enabler" 
+		echo $MANUAL_CONFIG_INSTRUCTION
+		exit 1
+	fi
+
+	#if it is a success, then log message "Script Succeeded" to config syslog and exit the script
+	if [[ $cslStatus == "SUCCESS" ]]; then
+		sendPayloadToConfigSysLog "SUCCESS" "Script Succeeded" "$enabler"
+	fi
+}
+
+sendPayloadToConfigSysLog()
+{
+	if [ "$APP_TAG" = "" ]; then
+		var="{\"sub-domain\":\"$LOGGLY_ACCOUNT\", \"host-name\":\"$HOST_NAME\", \"script-name\":\"$SCRIPT_NAME\", \"script-version\":\"$SCRIPT_VERSION\", \"status\":\"$1\", \"time-stamp\":\"$currentTime\", \"linux-distribution\":\"$LINUX_DIST\", \"messages\":\"$2\"}"
+	else
+		var="{\"sub-domain\":\"$LOGGLY_ACCOUNT\", \"host-name\":\"$HOST_NAME\", \"script-name\":\"$SCRIPT_NAME\", \"script-version\":\"$SCRIPT_VERSION\", \"status\":\"$1\", \"time-stamp\":\"$currentTime\", \"linux-distribution\":\"$LINUX_DIST\", $APP_TAG, \"messages\":\"$2\"}"
+	fi
+	curl -s -H "content-type:application/json" -d "$var" $LOGS_01_URL/inputs/$3 > /dev/null 2>&1
+}
+
+#get password in the form of asterisk
+getPassword()
+{
+	unset LOGGLY_PASSWORD
+	prompt="Please enter Loggly Password:"
+	while IFS= read -p "$prompt" -r -s -n 1 char
+	do
+		if [[ $char == $'\0' ]]
+		then
+			break
+		fi
+		prompt='*'
+		LOGGLY_PASSWORD+="$char"
+	done
+	echo
+}
+
+#checks if user has root privileges
+checkIfUserHasRootPrivileges()
+{
+	#This script needs to be run as a sudo user
+	if [[ $EUID -ne 0 ]]; then
+	   logMsgToConfigSysLog "ERROR" "ERROR: This script must be run as root."
+	   exit 1
+	fi
+}
+
+#display usage syntax
+usage()
+{
+cat << EOF
+usage: configure-linux [-a loggly auth account or subdomain] [-t loggly token] [-u username] [-p password (optional)]
+usage: configure-linux [-h for help]
+EOF
+}
+
+##########  Get Inputs from User - Start  ##########
+if [ "$1" != "being-invoked" ]; then
+	if [ $# -eq 0 ]; then
+		usage
+		exit
+	else
+	while [ "$1" != "" ]; do
+		case $1 in
+		  -t | --token ) shift
+			 LOGGLY_AUTH_TOKEN=$1
+			 echo "AUTH TOKEN $LOGGLY_AUTH_TOKEN"
+			 ;;
+		  -a | --account ) shift
+			 LOGGLY_ACCOUNT=$1
+			 echo "Loggly account or subdomain: $LOGGLY_ACCOUNT"
+			 ;;
+		  -u | --username ) shift
+			 LOGGLY_USERNAME=$1
+			 echo "Username is set"
+			 ;;
+		 -p | --password ) shift
+			  LOGGLY_PASSWORD=$1
+			 ;;
+		  -h | --help)
+			  usage
+			  exit
+			  ;;
+		esac
+		shift
+	done
+	fi
+
+	if [ "$LOGGLY_DEBUG" != ""  -a  "$LOGGLY_AUTH_TOKEN" != "" -a "$LOGGLY_ACCOUNT" != "" -a "$LOGGLY_USERNAME" != "" ]; then
+		if [ "$LOGGLY_PASSWORD" = "" ]; then
+			getPassword
+		fi
+		debug
+	elif [ "$LOGGLY_AUTH_TOKEN" != "" -a "$LOGGLY_ACCOUNT" != "" -a "$LOGGLY_USERNAME" != "" ]; then
+		if [ "$LOGGLY_PASSWORD" = "" ]; then
+			getPassword
+		fi
+		configureLogglyForLinux
+	elif [ "$LOGGLY_ROLLBACK" != "" ]; then
+		rollback
+	else
+		usage
+	fi
+fi
+
+##########  Get Inputs from User - End  ##########
diff --git a/Modular Scripts/Tomcat/configure-tomcat.sh b/Modular Scripts/Tomcat/configure-tomcat.sh
new file mode 100644
index 0000000..243f9f0
--- /dev/null
+++ b/Modular Scripts/Tomcat/configure-tomcat.sh	
@@ -0,0 +1,522 @@
+#!/bin/bash
+
+source configure-linux.sh "being-invoked"
+
+##########  Variable Declarations - Start  ##########
+#name of the current script
+SCRIPT_NAME=configure-tomcat.sh
+#version of the current script
+SCRIPT_VERSION=1.0
+
+#minimum version of tomcat to enable log rotation
+MIN_TOMCAT_VERSION=6.0.33.0
+
+#we have not found the tomcat version yet at this point in the script
+APP_TAG="\"tomcat-version\":\"\""
+
+#name of the service, in this case tomcat6
+SERVICE=tomcat6
+#directory location for syslog
+SYSLOG_ETCDIR_CONF=/etc/rsyslog.d
+#name and location of tomcat syslog file
+TOMCAT_SYSLOG_CONFFILE=$SYSLOG_ETCDIR_CONF/21-tomcat.conf
+#syslog directory
+SYSLOG_DIR=/var/spool/rsyslog
+
+#this variable will hold the host name
+HOST_NAME=
+#this variable will hold the name of the linux distribution
+LINUX_DIST=
+
+#this variable will hold the path to the catalina home
+LOGGLY_CATALINA_HOME=
+#this variable will hold the path to the conf folder within catalina home
+LOGGLY_CATALINA_CONF_HOME=
+#this variable will hold the path to the logging.properties file within
+#catalina_home/conf directory
+LOGGLY_CATALINA_PROPFILE=
+#this variable will hold the path to the logging.properties.loggly.bk file we
+#create to take a backup of logging.properties within catalina_home/conf directory
+LOGGLY_CATALINA_BACKUP_PROPFILE=
+#this variable will hold the value of the tomcat log folder
+LOGGLY_CATALINA_LOG_HOME=
+#this variable will hold the path of the catalina.jar file
+CATALINA_JAR_PATH=
+#this variable will hold the users tomcat version
+TOMCAT_VERSION=
+#this variable will hold the location of log4j files path
+LOG4J_FILE_PATH=
+
+#this variable will hold the catalina home provide by user.
+#this is not a mandatory input
+LOGGLY_CATALINA_HOME=
+
+MANUAL_CONFIG_INSTRUCTION="Manual instructions to configure Tomcat is available at https://www.loggly.com/docs/tomcat-application-server"
+##########  Variable Declarations - End  ##########
+
+#sets tomcat variables which will be used across various functions
+setTomcatVariables()
+{
+#get CATALINA_HOME, this sets the value for LOGGLY_CATALINA_HOME variable
+getCatalinaHome $SERVICE
+
+#set value for catalina conf home path, logging.properties path and
+#logging.properties.loggly.bk path
+LOGGLY_CATALINA_CONF_HOME=$LOGGLY_CATALINA_HOME/conf
+LOGGLY_CATALINA_PROPFILE=$LOGGLY_CATALINA_CONF_HOME/logging.properties
+LOGGLY_CATALINA_BACKUP_PROPFILE=$LOGGLY_CATALINA_PROPFILE.loggly.bk
+
+LOGGLY_CATALINA_LOG_HOME=/var/log/$SERVICE
+
+#default path for catalina.jar
+CATALINA_JAR_PATH=$LOGGLY_CATALINA_HOME/lib/catalina.jar
+
+#check if the identified CATALINA_HOME has the catalina.jar
+if [ ! -f "$CATALINA_JAR_PATH" ]; then
+	#if not, search it throughout the system. If we find no entries or more than
+	#1 entry, then we cannot determine the version of the tomcat
+	logMsgToConfigSysLog "INFO" "INFO: Could not find catalina.jar in $LOGGLY_CATALINA_HOME/lib. Searching at other locations, this may take some time."
+	if [ $(sudo find / -name catalina.jar | grep tomcat6 | wc -l) = 1 ]; then
+			CATALINA_JAR_PATH=$(sudo find / -name catalina.jar | grep tomcat6)
+			logMsgToConfigSysLog "INFO" "INFO: Found catalina.jar at $CATALINA_JAR_PATH."
+	else
+		logMsgToConfigSysLog "WARNING" "WARNING: Unable to determine the correct version of tomcat 6. Assuming its >= to 6.0.33."
+	fi
+fi
+
+#get the tomcat version number
+if [ -f "$CATALINA_JAR_PATH" ]; then
+	TOMCAT_VERSION=$(sudo java -cp $CATALINA_JAR_PATH org.apache.catalina.util.ServerInfo | grep "Server number")
+	TOMCAT_VERSION=${TOMCAT_VERSION#*: }
+	TOMCAT_VERSION=$TOMCAT_VERSION | tr -d ' '
+	APP_TAG="\"tomcat-version\":\"$TOMCAT_VERSION\""
+
+	tomcatMajorVersion=${TOMCAT_VERSION%%.*}
+	if [ $tomcatMajorVersion -ne 6 ]; then
+			echo "ERROR" "ERROR: This script only supports Tomcat version 6."
+			exit 1
+	fi
+fi
+}
+
+#try to deduce tomcat home if user has not provided one
+getCatalinaHome()
+{
+	#if user has not provided the catalina home
+	if [ "$LOGGLY_CATALINA_HOME" = "" ]; then
+		case "$LINUX_DIST" in
+			*"Ubuntu"* )
+			checkIfValidCatalinaHome "/var/lib/$1"
+			;;
+			*"Red Hat"* )
+			checkIfValidCatalinaHome "/usr/share/$1"
+			;;
+			*"CentOS"* )
+			checkIfValidCatalinaHome "/usr/share/$1"
+			;;
+		esac
+	else
+		checkIfValidCatalinaHome "$LOGGLY_CATALINA_HOME"
+	fi
+	logMsgToConfigSysLog "INFO" "INFO: CATALINA HOME: $LOGGLY_CATALINA_HOME"
+}
+
+#checks if the catalina home is a valid one by searching for logging.properties and
+#checks for startup.sh if tomcat is not configured as service
+checkIfValidCatalinaHome()
+{
+	LOGGLY_CATALINA_HOME=$1
+	#check if logging.properties files  is present
+	if [ ! -f "$LOGGLY_CATALINA_HOME/conf/logging.properties" ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: Unable to find conf/logging.properties file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option."
+		exit 1
+	#check if tomcat is configured as a service. If no, then check if we have access to startup.sh file
+	elif [ ! -f /etc/init.d/$SERVICE ]; then
+		logMsgToConfigSysLog "INFO" "INFO: Tomcat is not configured as a service"
+		if [ ! -f "$LOGGLY_CATALINA_HOME/bin/startup.sh" ]; then
+			logMsgToConfigSysLog "ERROR" "ERROR: Unable to find bin/startup.sh file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option."
+			exit 1
+		fi
+	fi
+}
+
+
+#checks if the tomcat is already configured with log4j. If yes, then exit
+checkIfTomcatConfiguredWithLog4J()
+{
+	echo "INFO: Checking if tomcat is configured with log4j logger"
+	#default path for log4j files
+	LOG4J_FILE_PATH=$LOGGLY_CATALINA_HOME/lib/log4j*
+	#check if the log4j files are present, if yes, then exit
+	if ls $LOG4J_FILE_PATH > /dev/null 2>&1; then
+		logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j"
+		exit 1
+	else
+		#if not found in the default path, check in the path where catalina.jar is found
+		libDirName=$(dirname ${CATALINA_JAR_PATH})
+		LOG4J_FILE_PATH=$libDirName/log4j*
+		if ls $LOG4J_FILE_PATH > /dev/null 2>&1; then
+			logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j"
+			exit 1
+		fi
+	fi
+	logMsgToConfigSysLog "INFO" "INFO: Tomcat seems not to be configured with log4j logger"
+}
+
+# executing the script for loggly to install and configure syslog.
+configureLogglyForTomcat()
+{
+	configureLogglyForLinux
+	setTomcatVariables
+
+	logMsgToConfigSysLog "INFO" "INFO: Tomcat logging properties file: $LOGGLY_CATALINA_PROPFILE"
+
+	# backup the logging properties file just in case it need to reverted.
+	echo "INFO: Going to back up the properties file: $LOGGLY_CATALINA_PROPFILE to $LOGGLY_CATALINA_BACKUP_PROPFILE."
+	if [ ! -f $LOGGLY_CATALINA_PROPFILE ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: logging.properties file not found!. Looked at location $LOGGLY_CATALINA_PROPFILE."
+		exit 1
+	else
+		# dont take a backup of logging properties file if it is already there
+		if [ ! -f $LOGGLY_CATALINA_BACKUP_PROPFILE ]; then
+			sudo cp -f $LOGGLY_CATALINA_PROPFILE $LOGGLY_CATALINA_BACKUP_PROPFILE
+		fi
+	fi
+
+	#check if tomcat version is less than 6.0.33.0, if yes, throw a warning
+	if [ $(compareVersions $TOMCAT_VERSION $MIN_TOMCAT_VERSION 4) -lt 0 ]; then
+		logMsgToConfigSysLog "WARNING" "WARNING: Tomcat version is less than 6.0.33. Log rotation cannot be disabled for version <6.0.33; only catalina.out log will be monitored."
+	fi
+
+	#Log rotation is not supported on version below 6.0.33.0, logging.properties should not be modified
+	#in such case. If version is above 6.0.33.0, then do the following
+	if [ $(compareVersions $TOMCAT_VERSION $MIN_TOMCAT_VERSION 4) -ge 0 ]; then
+		#removing the end . from logging.properties variable 1catalina.org.apache.juli.FileHandler.prefix = catalina.
+		if grep -Fq "prefix = catalina." $LOGGLY_CATALINA_PROPFILE
+		then
+			sudo sed -i "s/prefix = catalina./prefix = catalina/g" $LOGGLY_CATALINA_PROPFILE
+		fi
+		if grep -Fq "prefix = localhost." $LOGGLY_CATALINA_PROPFILE
+		then
+			sudo sed -i "s/prefix = localhost./prefix = localhost/g" $LOGGLY_CATALINA_PROPFILE
+		fi
+		if grep -Fq "prefix = manager." $LOGGLY_CATALINA_PROPFILE
+		then
+			sudo sed -i "s/prefix = manager./prefix = manager/g" $LOGGLY_CATALINA_PROPFILE
+		fi
+		if grep -Fq "prefix = host-manager." $LOGGLY_CATALINA_PROPFILE
+		then
+			sudo sed -i "s/prefix = host-manager./prefix = host-manager/g" $LOGGLY_CATALINA_PROPFILE
+		fi
+
+		#Check if the rotatable property is present in logging.properties
+		if grep -Fq "rotatable" $LOGGLY_CATALINA_PROPFILE
+		then
+			#If present, set all the values to false
+			sed -i -e 's/rotatable = true/rotatable = false/g' $LOGGLY_CATALINA_PROPFILE
+		fi
+
+		if [ $(fgrep "rotatable = false" "$LOGGLY_CATALINA_PROPFILE" | wc -l) -lt 4 ]; then
+			#If rotatable property present or not, add the following lines to disable rotation in any case
+sudo cat << EOIPFW >> $LOGGLY_CATALINA_PROPFILE
+1catalina.org.apache.juli.FileHandler.rotatable = false
+2localhost.org.apache.juli.FileHandler.rotatable = false
+3manager.org.apache.juli.FileHandler.rotatable = false
+4host-manager.org.apache.juli.FileHandler.rotatable = false
+EOIPFW
+		fi
+	fi
+
+	#Create tomcat syslog config file if it doesn't exist
+	echo "INFO: Checking if tomcat sysconf file $TOMCAT_SYSLOG_CONFFILE exist."
+	if [ -f "$TOMCAT_SYSLOG_CONFFILE" ]; then
+	   logMsgToConfigSysLog "INFO" "INFO: Tomcat syslog file $TOMCAT_SYSLOG_CONFFILE exist, not creating file."
+	else
+	   logMsgToConfigSysLog "INFO" "INFO: Creating file $TOMCAT_SYSLOG_CONFFILE."
+	   sudo touch $TOMCAT_SYSLOG_CONFFILE
+	   sudo chmod o+w $TOMCAT_SYSLOG_CONFFILE
+	   generateTomcat21File
+	fi
+
+	tomcatInitialLogCount=0
+	tomcatLatestLogCount=0
+	queryParam="tag%3Atomcat&from=-15m&until=now&size=1"
+	searchAndFetch tomcatInitialLogCount "$queryParam"
+
+	logMsgToConfigSysLog "INFO" "INFO: Restarting rsyslog and tomcat to generate logs for verification."
+	# restart the syslog service.
+	restartsyslog
+	# restart the tomcat service.
+	restartTomcat
+	searchAndFetch tomcatLatestLogCount "$queryParam"
+
+	counter=1
+	maxCounter=10
+	#echo "latest tomcat log count: $tomcatLatestLogCount and before query count: $tomcatInitialLogCount"
+	while [ "$tomcatLatestLogCount" -le "$tomcatInitialLogCount" ]; do
+		echo "######### waiting for 30 secs while loggly processes the test events."
+		sleep 30
+		echo "######## Done waiting. verifying again..."
+		logMsgToConfigSysLog "INFO" "INFO: Try # $counter of total $maxCounter"
+		searchAndFetch tomcatLatestLogCount "$queryParam"
+		#echo "Again Fetch: initial count $tomcatInitialLogCount : latest count : $tomcatLatestLogCount  counter: $counter  max counter: $maxCounter"
+		let counter=$counter+1
+		if [ "$counter" -gt "$maxCounter" ]; then
+			logMsgToConfigSysLog "ERROR" "ERROR: Tomcat logs did not make to Loggly in stipulated time. Please check your token & network/firewall settings and retry."
+			exit 1
+		fi
+	done
+
+	if [ "$tomcatLatestLogCount" -gt "$tomcatInitialLogCount" ]; then
+		logMsgToConfigSysLog "SUCCESS" "SUCCESS: Tomcat logs successfully transferred to Loggly."
+		exit 0
+	fi
+}
+# End of configure rsyslog for tomcat
+
+#function to generate tomcat syslog config file
+generateTomcat21File()
+{
+
+	imfileStr="\$ModLoad imfile
+	\$WorkDirectory $SYSLOG_DIR
+	"
+	if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
+		imfileStr+="\$PrivDropToGroup adm
+		"
+	fi
+
+	imfileStr+="
+	#parameterized token here.......
+	#Add a tag for tomcat events
+	\$template LogglyFormatTomcat,\"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [$LOGGLY_AUTH_TOKEN@41058 tag=\\\"tomcat\\\"] %msg%\n\"
+
+	# catalina.out
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/catalina.out
+	\$InputFileTag catalina-out
+	\$InputFileStateFile stat-catalina-out
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'catalina-out' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'catalina-out' then ~
+
+	# initd.log
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/initd.log
+	\$InputFileTag initd
+	\$InputFileStateFile stat-initd
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'initd' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'initd' then ~
+	"
+
+	#if log rotation is enabled i.e. tomcat version is greater than or equal to
+	#6.0.33.0, then add the following lines to tomcat syslog conf file
+	if [ $(compareVersions $TOMCAT_VERSION $MIN_TOMCAT_VERSION 4) -ge 0 ]; then
+	imfileStr+="
+	# catalina.log
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/catalina.log
+	\$InputFileTag catalina-log
+	\$InputFileStateFile stat-catalina-log
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'catalina-log' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'catalina-log' then ~
+
+	# host-manager.log
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/host-manager.log
+	\$InputFileTag host-manager
+	\$InputFileStateFile stat-host-manager
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'host-manager' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'host-manager' then ~
+
+	# localhost.log
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/localhost.log
+	\$InputFileTag localhost-log
+	\$InputFileStateFile stat-localhost-log
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'localhost-log' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'localhost-log' then ~
+
+	# manager.log
+	\$InputFileName $LOGGLY_CATALINA_LOG_HOME/manager.log
+	\$InputFileTag manager
+	\$InputFileStateFile stat-manager
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+	if \$programname == 'manager' then @@logs-01.loggly.com:514;LogglyFormatTomcat
+	if \$programname == 'manager' then ~
+	"
+	fi
+
+	#change the tomcat-21 file to variable from above and also take the directory of the tomcat log file.
+sudo cat << EOIPFW >> $TOMCAT_SYSLOG_CONFFILE
+$imfileStr
+EOIPFW
+}
+
+#rollback tomcat loggly configuration
+rollback()
+{
+	checkIfUserHasRootPrivileges
+	setLinuxVariables
+	setTomcatVariables
+	logMsgToConfigSysLog "INFO" "INFO: Initiating rollback"
+	echo "INFO: Reverting the catalina file."
+	if [ -f "$LOGGLY_CATALINA_BACKUP_PROPFILE" ]; then
+		sudo rm -fr $LOGGLY_CATALINA_PROPFILE
+		sudo cp -f $LOGGLY_CATALINA_BACKUP_PROPFILE $LOGGLY_CATALINA_PROPFILE
+		sudo rm -fr $LOGGLY_CATALINA_BACKUP_PROPFILE
+	fi
+	echo "INFO: Deleting the loggly tomcat syslog conf file."
+	if [ -f "$TOMCAT_SYSLOG_CONFFILE" ]; then
+		sudo rm -rf "$TOMCAT_SYSLOG_CONFFILE"
+	fi
+	echo "INFO: Removed all the modified files."
+	restartTomcat
+	logMsgToConfigSysLog "INFO" "INFO: Rollback completed."
+}
+
+#$1 return the count of records in loggly, $2 is the query param to search in loggly
+searchAndFetch()
+{
+    searchquery="$2"
+    url="$LOGGLY_ACCOUNT_URL/apiv2/search?q=$searchquery"
+    logMsgToConfigSysLog "INFO" "INFO: Search URL: $url"
+    result=$(wget -qO- /dev/stdout --user "$LOGGLY_USERNAME" --password "$LOGGLY_PASSWORD" "$url")
+    if [ -z "$result" ]; then
+		logMsgToConfigSysLog "ERROR" "ERROR: Please check your network/firewall settings & ensure Loggly subdomain, username and password is specified correctly."
+		exit 1
+    fi
+    id=$(echo "$result" | grep -v "{" | grep id | awk '{print $2}')
+    # strip last double quote from id
+    id="${id%\"}"
+    # strip first double quote from id
+    id="${id#\"}"
+    #echo "rsid for the search is: $id"
+    url="$LOGGLY_ACCOUNT_URL/apiv2/events?rsid=$id"
+
+    # retrieve the data
+    result=$(wget -qO- /dev/stdout --user "$LOGGLY_USERNAME" --password "$LOGGLY_PASSWORD" "$url")
+	#echo "actual result based on rsid: $result"
+    count=$(echo "$result" | grep total_events | awk '{print $2}')
+    count="${count%\,}"
+    eval $1="'$count'"
+    echo "Count of events from loggly: "$count""
+    if [ "$count" > 0 ]; then
+        timestamp=$(echo "$result" | grep timestamp)
+		#echo "timestamp: "$timestamp""
+        #echo "Data made successfully to loggly!!!"
+    fi
+}
+
+#restart tomcat
+restartTomcat()
+{
+	#sudo service tomcat restart or home/bin/start.sh
+	if [ $(ps -ef | grep -v grep | grep "$SERVICE" | wc -l) > 0 ]; then
+		logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running"
+		if [ -f /etc/init.d/$SERVICE ]; then
+			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running as service."
+			logMsgToConfigSysLog "INFO" "INFO: Restarting the tomcat service."
+			sudo service $SERVICE restart
+			if [ $? -ne 0 ]; then
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not restart gracefully. Log rotation may not be disabled. Please restart tomcat manually."
+			fi
+		else
+			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is not running as service."
+			# To be commented only for test
+			logMsgToConfigSysLog "INFO" "INFO: Shutting down tomcat."
+			sudo $LOGGLY_CATALINA_HOME/bin/shutdown.sh
+			if [ $? -ne 0 ]; then
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not shut down gracefully."
+			else
+				logMsgToConfigSysLog "INFO" "INFO: Done shutting down tomcat."
+			fi
+
+			logMsgToConfigSysLog "INFO" "INFO: Starting up tomcat."
+			sudo $LOGGLY_CATALINA_HOME/bin/startup.sh
+			if [ $? -ne 0 ]; then
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not start up down gracefully."
+			else
+				logMsgToConfigSysLog "INFO" "INFO: Tomcat is up and running."
+			fi
+		fi
+	fi
+}
+
+#display usage syntax
+usage()
+{
+cat << EOF
+usage: ltomcatsetup [-a loggly auth account or subdomain] [-t loggly token] [-u username] [-p password (optional)] [-ch catalina home (optional)]
+usage: ltomcatsetup [-r to rollback] [-ch catalina home (optional)]
+usage: ltomcatsetup [-h for help]
+EOF
+}
+
+##########  Get Inputs from User - Start  ##########
+
+if [ $# -eq 0 ]; then
+    usage
+	exit
+else
+while [ "$1" != "" ]; do
+    case $1 in
+     -ch | --catalinahome ) shift
+         LOGGLY_CATALINA_HOME=$1
+         echo "CATALINA HOME from input: $LOGGLY_CATALINA_HOME"
+         ;;
+      -t | --token ) shift
+         LOGGLY_AUTH_TOKEN=$1
+         echo "AUTH TOKEN $LOGGLY_AUTH_TOKEN"
+         ;;
+      -a | --account ) shift
+         LOGGLY_ACCOUNT=$1
+         echo "Loggly account or subdomain: $LOGGLY_ACCOUNT"
+         ;;
+      -u | --username ) shift
+         LOGGLY_USERNAME=$1
+         echo "Username is set"
+         ;;
+	  -p | --password ) shift
+          LOGGLY_PASSWORD=$1
+         ;;
+      -r | --rollback )
+		  LOGGLY_ROLLBACK="true"
+          ;;
+      -h | --help)
+          usage
+          exit
+          ;;
+    esac
+    shift
+done
+fi
+
+if [ "$LOGGLY_DEBUG" != ""  -a  "$LOGGLY_AUTH_TOKEN" != "" -a "$LOGGLY_ACCOUNT" != "" -a "$LOGGLY_USERNAME" != "" ]; then
+	if [ "$LOGGLY_PASSWORD" = "" ]; then
+		getPassword
+	fi
+    debug
+elif [ "$LOGGLY_AUTH_TOKEN" != "" -a "$LOGGLY_ACCOUNT" != "" -a "$LOGGLY_USERNAME" != "" ]; then
+	if [ "$LOGGLY_PASSWORD" = "" ]; then
+		getPassword
+	fi
+    configureLogglyForTomcat
+elif [ "$LOGGLY_ROLLBACK" != "" ]; then
+    rollback
+else
+	usage
+fi
+
+##########  Get Inputs from User - End  ##########
\ No newline at end of file
diff --git a/ltomcatsetup.sh b/ltomcatsetup.sh
index 652348d..7e8746a 100755
--- a/ltomcatsetup.sh
+++ b/ltomcatsetup.sh
@@ -91,7 +91,7 @@ HOST_NAME=$(hostname)
 LINUX_DIST=$(lsb_release -ds)
 
 if [ $? -ne 0 ]; then
-	logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script"
+	logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script."
 	exit 1
 else
 	#remove double quotes (if any) from the linux distribution name
@@ -99,16 +99,16 @@ else
 	LINUX_DIST="${LINUX_DIST#\"}"
 	case "$LINUX_DIST" in
 		*"Ubuntu"* )
-		echo "INFO: Operating system is Ubuntu"
+		echo "INFO: Operating system is Ubuntu."
 		;;
 		*"Red Hat"* )
-		echo "INFO: Operating system is Red Hat"
+		echo "INFO: Operating system is Red Hat."
 		;;
 		*"CentOS"* )
-		echo "INFO: Operating system is CentOS"
+		echo "INFO: Operating system is CentOS."
 		;;
 		* )
-		logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script"
+		logMsgToConfigSysLog "ERROR" "ERROR: This operating system is not supported by the script."
 		exit 1
 		;;
 	esac
@@ -132,12 +132,12 @@ CATALINA_JAR_PATH=$LOGGLY_CATALINA_HOME/lib/catalina.jar
 if [ ! -f "$CATALINA_JAR_PATH" ]; then
 	#if not, search it throughout the system. If we find no entries or more than
 	#1 entry, then we cannot determine the version of the tomcat
-	logMsgToConfigSysLog "INFO" "INFO: Could not find catalina.jar in $LOGGLY_CATALINA_HOME/lib. Searching at other locations, this may take some time..."
+	logMsgToConfigSysLog "INFO" "INFO: Could not find catalina.jar in $LOGGLY_CATALINA_HOME/lib. Searching at other locations, this may take some time."
 	if [ $(sudo find / -name catalina.jar | grep tomcat6 | wc -l) = 1 ]; then
 			CATALINA_JAR_PATH=$(sudo find / -name catalina.jar | grep tomcat6)
-			logMsgToConfigSysLog "INFO" "INFO: Found catalina.jar at $CATALINA_JAR_PATH"
+			logMsgToConfigSysLog "INFO" "INFO: Found catalina.jar at $CATALINA_JAR_PATH."
 	else
-		logMsgToConfigSysLog "WARNING" "WARNING: Unable to determine the correct version of tomcat. Assuming its >= to 6.0.33"
+		logMsgToConfigSysLog "WARNING" "WARNING: Unable to determine the correct version of tomcat 6. Assuming its >= to 6.0.33."
 	fi
 fi
 
@@ -146,6 +146,12 @@ if [ -f "$CATALINA_JAR_PATH" ]; then
 	TOMCAT_VERSION=$(sudo java -cp $CATALINA_JAR_PATH org.apache.catalina.util.ServerInfo | grep "Server number")
 	TOMCAT_VERSION=${TOMCAT_VERSION#*: }
 	TOMCAT_VERSION=$TOMCAT_VERSION | tr -d ' '
+
+	tomcatMajorVersion=${TOMCAT_VERSION%%.*}
+	if [ $tomcatMajorVersion -ne 6 ]; then
+			echo "ERROR" "ERROR: This script only supports Tomcat version 6."
+			exit 1
+	fi
 fi
 
 #set loggly account url
@@ -181,13 +187,13 @@ checkIfValidCatalinaHome()
 	LOGGLY_CATALINA_HOME=$1
 	#check if logging.properties files  is present
 	if [ ! -f "$LOGGLY_CATALINA_HOME/conf/logging.properties" ]; then
-		logMsgToConfigSysLog "ERROR" "ERROR: Unable to find conf/logging.properties file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option"
+		logMsgToConfigSysLog "ERROR" "ERROR: Unable to find conf/logging.properties file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option."
 		exit 1
 	#check if tomcat is configured as a service. If no, then check if we have access to startup.sh file
 	elif [ ! -f /etc/init.d/$SERVICE ]; then
-		logMsgToConfigSysLog "INFO" "INFO: Tomcat is not configured as a service"
+		logMsgToConfigSysLog "INFO" "INFO: Tomcat 6 is not configured as a service"
 		if [ ! -f "$LOGGLY_CATALINA_HOME/bin/startup.sh" ]; then
-			logMsgToConfigSysLog "ERROR" "ERROR: Unable to find bin/startup.sh file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option"
+			logMsgToConfigSysLog "ERROR" "ERROR: Unable to find bin/startup.sh file within $LOGGLY_CATALINA_HOME. Please provide correct Catalina Home using -ch option."
 			exit 1
 		fi
 	fi
@@ -219,14 +225,14 @@ echo "INFO: Checking if $LOGGLY_ACCOUNT_URL is reachable"
 if [ $(curl -s --head  --request GET $LOGGLY_ACCOUNT_URL/login | grep "200 OK" | wc -l) == 1 ]; then
 	echo "INFO: $LOGGLY_ACCOUNT_URL is reachable"
 else
-	logMsgToConfigSysLog "WARNING" "WARNING: $LOGGLY_ACCOUNT_URL is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system..."
+	logMsgToConfigSysLog "WARNING" "WARNING: $LOGGLY_ACCOUNT_URL is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system."
 fi
 
 echo "INFO: Checking if $LOGS_01_HOST is reachable"
 if [ $(ping -c 1 $LOGS_01_HOST | grep "1 packets transmitted, 1 received, 0% packet loss" | wc -l) == 1 ]; then
 	echo "INFO: $LOGS_01_HOST is reachable"
 else
-	logMsgToConfigSysLog "WARNING" "WARNING: $LOGS_01_HOST is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system..."
+	logMsgToConfigSysLog "WARNING" "WARNING: $LOGS_01_HOST is not reachable. Please check your network and firewall settings. Continuing to configure Loggly on your system."
 fi
 
 echo "INFO: Checking if provided username and password is correct"
@@ -234,30 +240,30 @@ if [ $(curl -s -u $LOGGLY_USERNAME:$LOGGLY_PASSWORD $LOGGLY_ACCOUNT_URL/apiv2/cu
 	logMsgToConfigSysLog "ERROR" "ERROR: Invalid Loggly username or password"
 	exit 1
 else
-	logMsgToConfigSysLog "INFO" "INFO: Username and password authorized successfully"
+	logMsgToConfigSysLog "INFO" "INFO: Username and password authorized successfully."
 fi
 }
 
 #checks if the tomcat is already configured with log4j. If yes, then exit
 checkIfTomcatConfiguredWithLog4J()
 {
-echo "INFO: Checking if tomcat is configured with log4j logger"
+echo "INFO: Checking if Tomcat is configured with log4j logger"
 #default path for log4j files
 LOG4J_FILE_PATH=$LOGGLY_CATALINA_HOME/lib/log4j*
 #check if the log4j files are present, if yes, then exit
 if ls $LOG4J_FILE_PATH > /dev/null 2>&1; then
-	logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j/"
+	logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j"
 	exit 1
 else
 	#if not found in the default path, check in the path where catalina.jar is found
 	libDirName=$(dirname ${CATALINA_JAR_PATH})
 	LOG4J_FILE_PATH=$libDirName/log4j*
 	if ls $LOG4J_FILE_PATH > /dev/null 2>&1; then
-		logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j/"
+		logMsgToConfigSysLog "ERROR" "ERROR: Script does not support log4j logger. Please see $LOGGLY_COM_URL/docs/java-log4j"
 		exit 1
 	fi
 fi
-logMsgToConfigSysLog "INFO" "INFO: Tomcat seems not to be configured with log4j logger"
+logMsgToConfigSysLog "INFO" "INFO: Tomcat seems not to be configured with log4j logger."
 }
 
 # executing the script for loggly to install and configure syslog.
@@ -277,28 +283,28 @@ SYSLOG_VERSION=${SYSLOG_VERSION#* }
 SYSLOG_VERSION=${SYSLOG_VERSION%,*}
 SYSLOG_VERSION=$SYSLOG_VERSION | tr -d " "
 if [ $(compareVersions $SYSLOG_VERSION $MIN_SYSLOG_VERSION 3) -lt 0 ]; then
-	logMsgToConfigSysLog "ERROR" "ERROR: Min syslog version required is 5.8.0"
+	logMsgToConfigSysLog "ERROR" "ERROR: Min syslog version required is 5.8.0."
 	exit 1
 fi
 
-echo "INFO: Checking if loggly sysconf file $LOGGLY_SYSLOG_CONFFILE exist"
+echo "INFO: Checking if loggly sysconf file $LOGGLY_SYSLOG_CONFFILE exist."
 # if the loggly configuration file exist, then don't create it.
 if [ -f "$LOGGLY_SYSLOG_CONFFILE" ]; then
-    logMsgToConfigSysLog "INFO" "INFO: Loggly syslog file $LOGGLY_SYSLOG_CONFFILE exist, not creating file"
+    logMsgToConfigSysLog "INFO" "INFO: Loggly syslog file $LOGGLY_SYSLOG_CONFFILE exist, not creating file."
 else
-	logMsgToConfigSysLog "INFO" "INFO: Creating file $LOGGLY_SYSLOG_CONFFILE"
+	logMsgToConfigSysLog "INFO" "INFO: Creating file $LOGGLY_SYSLOG_CONFFILE."
     if [ "$LOGGLY_ACCOUNT" != "" ]; then
         wget -q -O - $LOGGLY_COM_URL/install/configure-syslog.py | sudo python - setup --auth $LOGGLY_AUTH_TOKEN --account $LOGGLY_ACCOUNT
     else
-		logMsgToConfigSysLog "ERROR" "ERROR: Loggly auth token is required to configure rsyslog. Please pass -a <auth token> while running script"
+		logMsgToConfigSysLog "ERROR" "ERROR: Loggly auth token is required to configure rsyslog. Please pass -a <auth token> while running script."
 		exit 1
     fi
 fi
 
 # backup the logging properties file just in case it need to reverted.
-echo "INFO: Going to back up the properties file: $LOGGLY_CATALINA_PROPFILE to $LOGGLY_CATALINA_BACKUP_PROPFILE"
+echo "INFO: Going to back up the properties file: $LOGGLY_CATALINA_PROPFILE to $LOGGLY_CATALINA_BACKUP_PROPFILE."
 if [ ! -f $LOGGLY_CATALINA_PROPFILE ]; then
-	logMsgToConfigSysLog "ERROR" "ERROR: logging.properties file not found!. Looked at location $LOGGLY_CATALINA_PROPFILE"
+	logMsgToConfigSysLog "ERROR" "ERROR: logging.properties file not found!. Looked at location $LOGGLY_CATALINA_PROPFILE."
 	exit 1
 else
 	# dont take a backup of logging properties file if it is already there
@@ -309,7 +315,7 @@ fi
 
 #check if tomcat version is less than 6.0.33.0, if yes, throw a warning
 if [ $(compareVersions $TOMCAT_VERSION $MIN_TOMCAT_VERSION 4) -lt 0 ]; then
-	logMsgToConfigSysLog "WARNING" "WARNING: Tomcat version is less than 6.0.33. Log rotation cannot be disabled for version <6.0.33; only catalina.out log will be monitored"
+	logMsgToConfigSysLog "WARNING" "WARNING: Tomcat version is less than 6.0.33. Log rotation cannot be disabled for version <6.0.33; only catalina.out log will be monitored."
 fi
 
 #Log rotation is not supported on version below 6.0.33.0, logging.properties should not be modified
@@ -353,13 +359,13 @@ fi
 
 # Create rsyslog dir if it doesn't exist, Modify the rsyslog directory if exist
 if [ -d "$SYSLOG_DIR" ]; then
-    logMsgToConfigSysLog "INFO" "INFO: $SYSLOG_DIR exist, not creating dir"
+    logMsgToConfigSysLog "INFO" "INFO: $SYSLOG_DIR exist, not creating dir."
     if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
-		logMsgToConfigSysLog "INFO" "INFO: Changing the permission on the rsyslog in /var/spool"
+		logMsgToConfigSysLog "INFO" "INFO: Changing the permission on the rsyslog in /var/spool."
 		sudo chown -R syslog:adm $SYSLOG_DIR
 	fi
 else
-    logMsgToConfigSysLog "INFO" "INFO: Creating directory $SYSLOGDIR..."
+    logMsgToConfigSysLog "INFO" "INFO: Creating directory $SYSLOGDIR."
     sudo mkdir -v $SYSLOG_DIR
 	 if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
 		sudo chown -R syslog:adm $SYSLOG_DIR
@@ -367,11 +373,11 @@ else
 fi
 
 #Create tomcat syslog config file if it doesn't exist
-echo "INFO: Checking if tomcat sysconf file $TOMCAT_SYSLOG_CONFFILE exist"
+echo "INFO: Checking if tomcat sysconf file $TOMCAT_SYSLOG_CONFFILE exist."
 if [ -f "$TOMCAT_SYSLOG_CONFFILE" ]; then
-   logMsgToConfigSysLog "INFO" "INFO: Tomcat syslog file $TOMCAT_SYSLOG_CONFFILE exist, not creating file"
+   logMsgToConfigSysLog "INFO" "INFO: Tomcat syslog file $TOMCAT_SYSLOG_CONFFILE exist, not creating file."
 else
-   logMsgToConfigSysLog "INFO" "INFO: Creating file $TOMCAT_SYSLOG_CONFFILE"
+   logMsgToConfigSysLog "INFO" "INFO: Creating file $TOMCAT_SYSLOG_CONFFILE."
    sudo touch $TOMCAT_SYSLOG_CONFFILE
    sudo chmod o+w $TOMCAT_SYSLOG_CONFFILE
    generateTomcat21File
@@ -382,7 +388,7 @@ tomcatLatestLogCount=0
 queryParam="tag%3Atomcat&from=-15m&until=now&size=1"
 searchAndFetch tomcatInitialLogCount "$queryParam"
 
-logMsgToConfigSysLog "INFO" "INFO: Restarting rsyslog and tomcat to generate logs for verification"
+logMsgToConfigSysLog "INFO" "INFO: Restarting rsyslog and tomcat to generate logs for verification."
 # restart the syslog service.
 restartsyslog
 # restart the tomcat service.
@@ -393,21 +399,21 @@ counter=1
 maxCounter=10
 #echo "latest tomcat log count: $tomcatLatestLogCount and before query count: $tomcatInitialLogCount"
 while [ "$tomcatLatestLogCount" -le "$tomcatInitialLogCount" ]; do
-	echo "######### waiting for 30 secs while loggly processes the test events..."
+	echo "######### waiting for 30 secs while loggly processes the test events."
 	sleep 30
 	echo "######## Done waiting. verifying again..."
-	logMsgToConfigSysLog "INFO" "INFO: Try # $counter of total $maxCounter"
+	logMsgToConfigSysLog "INFO" "INFO: Try # $counter of total $maxCounter."
 	searchAndFetch tomcatLatestLogCount "$queryParam"
 	#echo "Again Fetch: initial count $tomcatInitialLogCount : latest count : $tomcatLatestLogCount  counter: $counter  max counter: $maxCounter"
 	let counter=$counter+1
 	if [ "$counter" -gt "$maxCounter" ]; then
-		logMsgToConfigSysLog "ERROR" "ERROR: Tomcat logs did not make to Loggly in stipulated time. Please check your token & network/firewall settings and retry"
+		logMsgToConfigSysLog "ERROR" "ERROR: Tomcat logs did not make to Loggly in stipulated time. Please check your token & network/firewall settings and retry."
 		exit 1
 	fi
 done
 
 if [ "$tomcatLatestLogCount" -gt "$tomcatInitialLogCount" ]; then
-	logMsgToConfigSysLog "SUCCESS" "SUCCESS: Tomcat logs successfully transferred to Loggly"
+	logMsgToConfigSysLog "SUCCESS" "SUCCESS: Tomcat logs successfully transferred to Loggly."
 	exit 0
 fi
 }
@@ -508,26 +514,26 @@ rollback()
 {
 	checkIfUserHasRootPrivileges
 	setVariables
-	logMsgToConfigSysLog "INFO" "INFO: Initiating rollback"
-	echo "INFO: Reverting the catalina file ...."
+	logMsgToConfigSysLog "INFO" "INFO: Initiating rollback."
+	echo "INFO: Reverting the catalina file."
 	if [ -f "$LOGGLY_CATALINA_BACKUP_PROPFILE" ]; then
 		sudo rm -fr $LOGGLY_CATALINA_PROPFILE
 		sudo cp -f $LOGGLY_CATALINA_BACKUP_PROPFILE $LOGGLY_CATALINA_PROPFILE
 		sudo rm -fr $LOGGLY_CATALINA_BACKUP_PROPFILE
 	fi
-	echo "INFO: Deleting the loggly tomcat syslog conf file ...."
+	echo "INFO: Deleting the loggly tomcat syslog conf file."
 	if [ -f "$TOMCAT_SYSLOG_CONFFILE" ]; then
 		sudo rm -rf "$TOMCAT_SYSLOG_CONFFILE"
 	fi
-	echo "INFO: Removed all the modified files"
+	echo "INFO: Removed all the modified files."
 	restartTomcat
-	logMsgToConfigSysLog "INFO" "INFO: Rollback completed"
+	logMsgToConfigSysLog "INFO" "INFO: Rollback completed."
 }
 
 debug()
 {
 	setVariables
-	logMsgToConfigSysLog "INFO" "INFO: Initiating debug"
+	logMsgToConfigSysLog "INFO" "INFO: Initiating debug."
 	checkLogglyServersAccessiblilty
 
     #if [ -f loggly_tcpdump.log ]; then
@@ -578,7 +584,7 @@ debug()
 		echo "Again Fetch: initial count $initialCount : final count : $finalCount  counter: $counter  max counter: $maxCounter"
 		let counter=$counter+1
 		if [ "$counter" -gt "$maxCounter" ]; then
-			logMsgToConfigSysLog "ERROR" "ERROR: Debug logs did not make to Loggly in stipulated time. Please check your token & network/firewall settings and retry"
+			logMsgToConfigSysLog "ERROR" "ERROR: Debug logs did not make to Loggly in stipulated time. Please check your token & network/firewall settings and retry OR"
 			exit 1
 		fi
     done
@@ -597,7 +603,7 @@ searchAndFetch()
     logMsgToConfigSysLog "INFO" "INFO: Search URL: $url"
     result=$(wget -qO- /dev/stdout --user "$LOGGLY_USERNAME" --password "$LOGGLY_PASSWORD" "$url")
     if [ -z "$result" ]; then
-		logMsgToConfigSysLog "ERROR" "ERROR: Please check your network/firewall settings & ensure Loggly subdomain, username and password is specified correctly"
+		logMsgToConfigSysLog "ERROR" "ERROR: Please check your network/firewall settings & ensure Loggly subdomain, username and password is specified correctly."
 		exit 1
     fi
     id=$(echo "$result" | grep -v "{" | grep id | awk '{print $2}')
@@ -635,10 +641,10 @@ EOF
 #restart syslog
 restartsyslog()
 {
-	logMsgToConfigSysLog "INFO" "INFO: Restarting the rsyslog service"
+	logMsgToConfigSysLog "INFO" "INFO: Restarting the rsyslog service."
 	sudo service rsyslog restart
 	if [ $? -ne 0 ]; then
-		logMsgToConfigSysLog "WARNING" "WARNING: rsyslog did not restart gracefully. Please restart rsyslog manually"
+		logMsgToConfigSysLog "WARNING" "WARNING: rsyslog did not restart gracefully. Please restart rsyslog manually."
 	fi
 }
 
@@ -647,31 +653,31 @@ restartTomcat()
 {
 	#sudo service tomcat restart or home/bin/start.sh
 	if [ $(ps -ef | grep -v grep | grep "$SERVICE" | wc -l) > 0 ]; then
-		logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running"
+		logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running."
 		if [ -f /etc/init.d/$SERVICE ]; then
-			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running as service"
-			logMsgToConfigSysLog "INFO" "INFO: Restarting the tomcat service"
+			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is running as service."
+			logMsgToConfigSysLog "INFO" "INFO: Restarting the tomcat service."
 			sudo service $SERVICE restart
 			if [ $? -ne 0 ]; then
-				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not restart gracefully. Log rotation may not be disabled. Please restart tomcat manually"
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not restart gracefully. Log rotation may not be disabled. Please restart tomcat manually."
 			fi
 		else
-			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is not running as service..."
+			logMsgToConfigSysLog "INFO" "INFO: $SERVICE is not running as service."
 			# To be commented only for test
 			logMsgToConfigSysLog "INFO" "INFO: Shutting down tomcat..."
 			sudo $LOGGLY_CATALINA_HOME/bin/shutdown.sh
 			if [ $? -ne 0 ]; then
-				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not shut down gracefully"
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not shut down gracefully."
 			else
-				logMsgToConfigSysLog "INFO" "INFO: Done shutting down tomcat!"
+				logMsgToConfigSysLog "INFO" "INFO: Done shutting down tomcat."
 			fi
 
-			logMsgToConfigSysLog "INFO" "INFO: Starting up tomcat..."
+			logMsgToConfigSysLog "INFO" "INFO: Starting up tomcat."
 			sudo $LOGGLY_CATALINA_HOME/bin/startup.sh
 			if [ $? -ne 0 ]; then
-				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not start up down gracefully"
+				logMsgToConfigSysLog "WARNING" "WARNING: Tomcat did not start up down gracefully."
 			else
-				logMsgToConfigSysLog "INFO" "INFO: Tomcat is up and running"
+				logMsgToConfigSysLog "INFO" "INFO: Tomcat is up and running."
 			fi
 		fi
 	fi
@@ -682,7 +688,9 @@ logMsgToConfigSysLog()
 {
 	#$1 variable will be SUCCESS or ERROR or INFO or WARNING
 	#$2 variable will be the message
-	echo "$2"
+	cslStatus=$1
+	cslMessage=$2
+	echo "$cslMessage"
 	currentTime=$(date)
 
 	#for Linux system, we need to use -d switch to decode base64 whereas
@@ -695,13 +703,30 @@ logMsgToConfigSysLog()
 	fi
 
 	if [ $? -ne 0 ]; then
-        echo  "ERROR: Base64 decode is not supported on your Operating System. Please update your system to support Base64"
+        echo  "ERROR: Base64 decode is not supported on your Operating System. Please update your system to support Base64."
         exit 1
 	fi
 
-	var="{\"sub-domain\":\"$LOGGLY_ACCOUNT\", \"host-name\":\"$HOST_NAME\", \"script-name\":\"$SCRIPT_NAME\", \"script-version\":\"$SCRIPT_VERSION\", \"status\":\"$1\", \"time-stamp\":\"$currentTime\", \"linux-distribution\":\"$LINUX_DIST\", \"tomcat-version\":\"$TOMCAT_VERSION\", \"messages\":\"$2\"}"
+	sendPayloadToConfigSysLog "$cslStatus" "$cslMessage" "$enabler"
+
+	#if it is an error, then log message "Script Failed" to config syslog and exit the script
+	if [[ $cslStatus == "ERROR" ]]; then
+		sendPayloadToConfigSysLog "ERROR" "Script Failed" "$enabler"
+		echo "Please follow the manual instructions to configure tomcat at https://www.loggly.com/docs/tomcat-application-server"
+		exit 1
+	fi
+
+	#if it is a success, then log message "Script Succeeded" to config syslog and exit the script
+	if [[ $cslStatus == "SUCCESS" ]]; then
+		sendPayloadToConfigSysLog "SUCCESS" "Script Succeeded" "$enabler"
+		exit 0
+	fi
+}
 
-	curl -s -H "content-type:application/json" -d "$var" $LOGS_01_URL/inputs/$enabler > /dev/null 2>&1
+sendPayloadToConfigSysLog()
+{
+var="{\"sub-domain\":\"$LOGGLY_ACCOUNT\", \"host-name\":\"$HOST_NAME\", \"script-name\":\"$SCRIPT_NAME\", \"script-version\":\"$SCRIPT_VERSION\", \"status\":\"$1\", \"time-stamp\":\"$currentTime\", \"linux-distribution\":\"$LINUX_DIST\", \"tomcat-version\":\"$TOMCAT_VERSION\", \"messages\":\"$2\"}"
+curl -s -H "content-type:application/json" -d "$var" $LOGS_01_URL/inputs/$3 > /dev/null 2>&1
 }
 
 #get password in the form of asterisk
@@ -726,7 +751,7 @@ checkIfUserHasRootPrivileges()
 {
 	#This script needs to be run as a sudo user
 	if [[ $EUID -ne 0 ]]; then
-	   logMsgToConfigSysLog "ERROR" "ERROR: This script must be run as root"
+	   logMsgToConfigSysLog "ERROR" "ERROR: This script must be run as root."
 	   exit 1
 	fi
 }
@@ -789,4 +814,4 @@ else
 	usage
 fi
 
-##########  Get Inputs from User - End  ##########
+##########  Get Inputs from User - End  ##########
\ No newline at end of file