[Python-apps-commits] r10865 - in packages/sabnzbdplus/trunk/debian (sabnzbdplus.init)

[jcfp-guest at users.alioth.debian.org]

    Date: Sunday, May 18, 2014 @ 11:24:42
  Author: jcfp-guest
Revision: 10865

init: revert status changes

Modified:
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.init

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.init
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.init	2014-05-18 11:14:05 UTC (rev 10864)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.init	2014-05-18 11:24:42 UTC (rev 10865)
@@ -88,7 +88,7 @@
 		eval start-stop-daemon --start --quiet --chuid "$USER" --exec "$DAEMON" -- $OPTIONS
 		check_retval
 	else
-		log_action_msg "$DESC: already running"
+		log_action_msg "$DESC: already running (pid $(cat "$PIDFILE"))"
 	fi
 }
 
@@ -116,11 +116,13 @@
 		start_sab
 	;;
 	status)
-		# load_settings isn't strictly necessary here but does print a nice
-		# warning in case the service isn't enabled/configured at all
 		load_settings || exit 4
-		status_of_proc -p "$PIDFILE" "$DAEMON" "$DESC"
-		exit $?
+		if is_running; then
+			log_action_msg "$DESC: running (pid $(cat "$PIDFILE"))"
+		else
+			log_action_msg "$DESC: not running"
+			[ -f "$PIDFILE" ] && exit 1 || exit 3
+		fi
 	;;
 	*)
 		echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2