[freeside-commits] branch FREESIDE_3_BRANCH updated. 059868825596dc1bfc00a333f77e311da2fe6002

Ivan ivan at 420.am
Tue Feb 10 01:44:08 PST 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  059868825596dc1bfc00a333f77e311da2fe6002 (commit)
      from  1d4ea4545c4a86a0664feb537f06aa5eb7f54c07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 059868825596dc1bfc00a333f77e311da2fe6002
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 10 01:44:05 2015 -0800

    reliabily kill off old freeside-selfservice-server processes, RT#33174

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 705afc1..099603e 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -170,10 +170,10 @@ case "$1" in
           if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid ]
           then
             echo -n "Stopping freeside-selfservice-server to $MACHINE"
+            kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
             howlong=10
             while [ $howlong -gt 0 ] && kill -0 `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid` 2>/dev/null; do
               echo -n '.'
-              kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
               sleep 1
               howlong=$(( $howlong - 1 ))
               if [ $howlong -eq 0 ]; then

-----------------------------------------------------------------------

Summary of changes:
 init.d/freeside-init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




More information about the freeside-commits mailing list