Merge branch 'master' of https://github.com/goir/system_daemon into g…

…oir-master

Conflicts:
	System/Daemon/OS.php

data/template_Debian

@@ -66,7 +66,7 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
@@ -91,7 +91,7 @@ do_reload() {
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
 	return 0
 }
 
@@ -121,6 +121,9 @@ case "$1" in
 	#do_reload
 	#log_end_msg $?
 	#;;
+  status)
+    status_of_proc $DAEMON $NAME -p $PIDFILE
+    ;;
   restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
@@ -144,8 +147,8 @@ case "$1" in
 	esac
 	;;
   *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
 	exit 3
 	;;
 esac

examples/signals.php

@@ -57,7 +57,7 @@
 
 function myHandler($signal) {
     if ($signal === SIGTERM) {
-        System_Daemon::warning('I received the termination signal. ' . $sig);
+        System_Daemon::warning('I received the termination signal. ' . $signal);
         // Execute some final code
         // and be sure to:
         System_Daemon::stop();