[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-240-g7c35e2a

[Michael Chase-S. <mc...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  7c35e2a15e92d7822121aac634896b80faea3d1a (commit)
       via  a5bfd6693f3e8687fe1e490a5acef116b890653f (commit)
      from  b16f7d57d6ba175af30e3de51385a58fccc4cd14 (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 7c35e2a15e92d7822121aac634896b80faea3d1a
Author: Michael Chase-Salerno <br...@li...>
Date:   Mon Apr 9 13:10:26 2012 -0400

    3516167 Force kill sfcbd on stop if needed

commit a5bfd6693f3e8687fe1e490a5acef116b890653f
Author: Michael Chase-Salerno <br...@li...>
Date:   Mon Apr 9 13:08:59 2012 -0400

    3516167 Force kill sfcbd on stop if needed

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index fc26bb9..c894684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09 Michael Chase-Salerno <br...@li...>
+
+	* sfcb.init-none.in
+	[ 3516167 ] Force kill sfcbd on stop if needed
+
 2012-04-05  Narasimha Sharoff  <nsh...@us...>
 
 	* control.c:
diff --git a/NEWS b/NEWS
index 9f97b61..85f2653 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ New features:
 Bugs fixed: 
 - 3495804 Cleanup: httpProcId still defined, wrong define in cimXmlGen
 - 3498719 Better SSL error reporting for sfcb
+- 3516167 Force kill sfcbd on stop if needed
 
 Changes in 1.4.2
 ================
diff --git a/sfcb.init-none.in b/sfcb.init-none.in
index b5bbda1..b777237 100644
--- a/sfcb.init-none.in
+++ b/sfcb.init-none.in
@@ -20,10 +20,26 @@ start() {
 }	
 
 stop() {
-	echo -n "Shutting down sfcb: "
-	killall sfcbd && echo "done." && return 0 ||
-	echo "failed."
-	return 1
+    echo -n "Shutting down sfcb: "
+    if killall sfcbd
+    then
+        sleep 3
+        # If it hasn't died gracefully, kill it
+        if killall -KILL sfcbd 2>/dev/null
+        then
+                # In this case, it needed to be killed
+                echo "failed(killed)." 
+                exit 1
+        else
+                # In this case, it was already dead
+                echo "done."
+                exit 0
+        fi
+    else
+        # In this case, it probably wasn't running
+        echo "failed." 
+        exit 1
+    fi
 }
 
 reload() {


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker