Browse Source

Make our LSB init script _actually_ LSB compliant. (#17824)

We seem to have been relying on some Debian-specific stuff instead of
actually following LSB requirements.
Austin S. Hemmelgarn 9 months ago
parent
commit
a2f0b951d6
1 changed files with 11 additions and 5 deletions
  1. 11 5
      system/lsb/init.d/netdata.in

+ 11 - 5
system/lsb/init.d/netdata.in

@@ -47,18 +47,24 @@ service_start() {
 	
 	chown @netdata_user_POST@:@netdata_user_POST@ $PIDFILE_PATH
 	
-	log_daemon_msg "Starting real-time performance monitoring" "netdata"
+	log_success_msg "Starting real-time performance monitoring"
 	start_daemon -p $PIDFILE $DAEMON_PATH/$DAEMON $DAEMONOPTS
 	RETVAL=$?
-	log_end_msg $RETVAL
+	case "${RETVAL}" in
+		0) log_success_msg "Started real-time performance monitoring" ;;
+		*) log_error_msg "Failed to start real-time performance monitoring" ;;
+	esac
 	return $RETVAL
 }
 
 service_stop() {
-	log_daemon_msg "Stopping real-time performance monitoring" "netdata"
+	log_success_msg "Stopping real-time performance monitoring"
 	killproc -p ${PIDFILE} $DAEMON_PATH/$DAEMON
 	RETVAL=$?
-	log_end_msg $RETVAL
+	case "${RETVAL}" in
+		0) log_success_msg "Stopped real-time performance monitoring" ;;
+		*) log_error_msg "Failed to stop real-time performance monitoring" ;;
+	esac
 
 	if [ $RETVAL -eq 0 ]; then
 		rm -f ${PIDFILE}
@@ -77,7 +83,7 @@ condrestart() {
 }
 
 service_status() {
-	status_of_proc -p $PIDFILE $DAEMON_PATH/$DAEMON netdata
+	pidofproc -p $PIDFILE $DAEMON_PATH/$DAEMON
 }