opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 05:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

get rid of weird line breaks and use action (#4926)

Browse Source 
* get rid of weird line breaks and use action

When using restarts/stops/starts you'd get weird output sometimes, Strange line breaks 'OK' status overlapping the next lines etc...
This fixes those moves OK to the right place and colorizes them correctly.

* added : for more uniformity

when doing a restart the output looked like:
Stopping Grafana Server ...                                [  OK  ]
Starting Grafana Server: ...                               [  OK  ]

The Stopping line did not have a colon. I added it just to make it look better.
This commit is contained in:
Bryan Irvine
2016-07-11 06:23:39 -07:00
committed by Torkel Ödegaard
parent 66bcae353c
commit eafb0f3248
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packaging/rpm/init.d/grafana-server
View File

@ -72,8 +72,6 @@ function isRunning() {
case "$1" in
start)
echo -n $"Starting $DESC: .... "
isRunning
if [ $? -eq 0 ]; then
echo "Already running."
@ -90,7 +88,7 @@ case "$1" in
# Start Daemon
cd $GRAFANA_HOME
su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null
action $"Starting $DESC: ..." su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null
return=$?
if [ $return -eq 0 ]
then
@ -114,26 +112,25 @@ case "$1" in
done
fi
echo "OK"
exit $return
;;
stop)
echo -n "Stopping $DESC ..."
echo -n "Stopping $DESC: ..."
if [ -f "$PID_FILE" ]; then
killproc -p $PID_FILE -d 20 $NAME
if [ $? -eq 1 ]; then
echo -n "$DESC is not running but pid file exists, cleaning up"
echo "$DESC is not running but pid file exists, cleaning up"
elif [ $? -eq 3 ]; then
PID="`cat $PID_FILE`"
echo -n "Failed to stop $DESC (pid $PID)"
echo "Failed to stop $DESC (pid $PID)"
exit 1
fi
rm -f "$PID_FILE"
echo "OK"
echo ""
exit 0
else
echo -n "(not running)"
echo "(not running)"
fi
exit 0
;;