commit bb8227ce69b9b040b98dbe339e4f5c02172d19ac
author Dean Troyer <dtroyer@gmail.com> Mon Jan 27 12:21:52 2014 -0600
committer Dean Troyer <dtroyer@gmail.com> Mon Jan 27 16:03:53 2014 -0600
tree a4c25de90c1b984d6182225c88ad363936ce891f
parent b53dbad8ac42417960f39bbd1f0901ffae808075

Fix Swift process kill

stop_swift() was not killing all swift processes properly.  Change to
manually clean up all screen services with pkill.

Closes-bug: 1268794
Change-Id: Ibb7a2e0dd10a313609f05963264087f82f6f00e2

lib/swift

diff --git a/lib/swift b/lib/swift
index 44c230b..37b630c 100644
--- a/lib/swift
+++ b/lib/swift
@@ -652,8 +652,10 @@
     if type -p swift-init >/dev/null; then
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
     fi
-    # Dump the proxy server
-    sudo pkill -f swift-proxy-server
+    for type in proxy object container account; do
+        # Dump all of the servers
+        pkill -f swift-
+    done
 }
 
 # Restore xtrace