tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solr: Added status check for init script

Browse source
This commit is contained in:
Ossi Salmi 2013-05-31 13:37:52 +03:00
parent a6b82b4be1
commit 88b78138bf
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
solr/files/solr.init
View file

@ -40,7 +40,7 @@ fi
start_solr() { start_solr() {
# Check to see if Solr is running # Check to see if Solr is running
pgrep -u solr -f start.jar > /dev/null pgrep -u $SOLRUSER -f start.jar >/dev/null
RUNNING=$? RUNNING=$?
if [ $RUNNING -eq 0 ]; then if [ $RUNNING -eq 0 ]; then
echo "[FAILED]" echo "[FAILED]"
@ -52,13 +52,13 @@ start_solr() {
# Start Solr # Start Solr
echo "Starting Solr" echo "Starting Solr"
COMMAND="java -Dsolr.solr.home=${CONFIGPATH} ${MEMORYLIMIT} -jar start.jar > solr.log 2>&1 &" COMMAND="java -Dsolr.solr.home=${CONFIGPATH} ${MEMORYLIMIT} -jar start.jar >solr.log 2>&1 &"
su -s /bin/sh - ${SOLRUSER} -c "umask 007; cd ${SOLRPATH}; ${COMMAND}" su -s /bin/sh - ${SOLRUSER} -c "umask 007; cd ${SOLRPATH}; ${COMMAND}"
} }
stop_solr() { stop_solr() {
echo -n "Stopping Solr: " echo -n "Stopping Solr: "
pkill -u solr -f start.jar pkill -u $SOLRUSER -f start.jar
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo "Success" echo "Success"
@ -71,16 +71,23 @@ case "$1" in
start) start)
start_solr start_solr
;; ;;
stop) stop)
stop_solr stop_solr
;; ;;
restart) restart)
stop_solr stop_solr
sleep 2 sleep 2
start_solr start_solr
;; ;;
status)
pgrep -u $SOLRUSER -f start.jar >/dev/null
;;
*) *)
echo "Usage: $0 {start|stop|restart}" echo "Usage: $0 {start|stop|restart|status}"
exit 1 exit 1
;; ;;
esac esac

1
solr/manifests/init.pp
View file

@ -124,6 +124,7 @@ class solr {
} }
service { "solr": service { "solr":
ensure => running,
enable => true, enable => true,
} }