Merge lp:~roadmr/capomastro/init-papercuts into lp:capomastro

[Daniel Manrique]

Return proper error codes in the initscript. Invoke start-stop-daemon with proper PID.

Fixes for two tiny capomastro initscript bugs.

[Caio Begotti (caio1982)]

Daniel, thanks for these changes! I marked it as Needs Fixing simply because when I was testing the changes I noticed the start command would always return 0 still spawning rogues processes because of a bogus pgrep check (pgrep actually should be checking for python2.7 not celery, but that would be stupid so it's just easier to list all processes owned by the capomastro user). Can you incorporate this diff in your branch please? Otherwise your MR looks good so thanks again :-)

=== modified file 'debian/capomastro.init'
--- debian/capomastro.init 2015-04-27 18:25:17 +0000
+++ debian/capomastro.init 2015-06-09 13:18:58 +0000
@@ -54,7 +54,7 @@

   if [ -f ${PIDFILE} ]; then
     curpid=$(cat ${PIDFILE})
- if pgrep celery | grep -q ${curpid}; then
+ if pgrep -u capomastro | grep -q ${curpid}; then
       return 0
     else
       start-stop-daemon -b --start --quiet -m --user ${NAME} --pidfile ${PIDFILE} --chuid ${NAME} --exec ${DAEMON} -- ${DAEMON_ARGS} || return 2

review: Needs Fixing

[lp:~roadmr/capomastro/init-papercuts]

200. By Daniel Manrique on 2015-06-09

Fix pgrep so do_start doesn't spawn rogue processes

[Daniel Manrique (roadmr)]

I added your patch and this is ready for another review.

[Caio Begotti (caio1982)]

Thanks :-D

review: Approve

=== modified file 'debian/capomastro.init'
--- debian/capomastro.init	2015-04-27 18:25:17 +0000
+++ debian/capomastro.init	2015-06-09 13:45:18 +0000
@@ -54,7 +54,7 @@
 
   if [ -f ${PIDFILE} ]; then
     curpid=$(cat ${PIDFILE})
-    if pgrep celery | grep -q ${curpid}; then
+    if pgrep -u capomastro | grep -q ${curpid}; then
       return 0
     else
       start-stop-daemon -b --start --quiet -m --user ${NAME} --pidfile ${PIDFILE} --chuid ${NAME} --exec ${DAEMON} -- ${DAEMON_ARGS} || return 2
@@ -78,16 +78,17 @@
 
 do_check () {
   ${DAEMON} -A ${NAME} ${*}
-
-  [ "${?}" = 2 ] && return 2
-  return "${?}"
+  retval=${?}
+  [ "${retval}" = 2 ] && return 2
+  return "${retval}"
 }
 
 do_status () {
-  status_of_proc "${DAEMON}" "Service ${NAME}"
+  status_of_proc -p ${PIDFILE} "${DAEMON}" "Service ${NAME}"
+  retval=${?}
 
-  [ "${?}" = 2 ] && return 2
-  return "${?}"
+  [ "${retval}" = 2 ] && return 2
+  return "${retval}"
 }
 
 case "${1}" in