Browse Source

Fixed failure loop in init.d script when grafana will not start (due to permission issue or other), Fixes #1837

Torkel Ödegaard 10 years ago
parent
commit
90a77bdf85
1 changed files with 5 additions and 1 deletions
  1. 5 1
      packaging/deb/init.d/grafana-server

+ 5 - 1
packaging/deb/init.d/grafana-server

@@ -87,6 +87,7 @@ case "$1" in
     # check if pid file has been written two
     # check if pid file has been written two
 	  if ! [[ -s $PID_FILE ]]; then
 	  if ! [[ -s $PID_FILE ]]; then
 	    log_end_msg 1
 	    log_end_msg 1
+	    exit 1
 	  fi
 	  fi
 
 
 		i=0
 		i=0
@@ -96,7 +97,10 @@ case "$1" in
 		do
 		do
 			sleep 1
 			sleep 1
 			i=$(($i + 1))
 			i=$(($i + 1))
-			[ $i -gt $timeout ] && log_end_msg 1
+      if [ $i -gt $timeout ]; then
+			  log_end_msg 1
+			  exit 1
+			fi
 		done
 		done
   fi
   fi
   log_end_msg $return
   log_end_msg $return