Merge "Make stop_swift() more robust for Grenade"

2014-03-08 15:26:33 +00:00 · 2014-03-08 15:26:33 +00:00 · b28103b2e8
commit b28103b2e8
parent e0ec5cce44 1eae3e155a
1 changed files with 5 additions and 0 deletions
--- a/lib/swift
+++ b/lib/swift
@ -687,6 +687,11 @@ function stop_swift {
        swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
    fi
    # Dump all of the servers
+    # Maintain the iteration as screen_stop() has some desirable side-effects
+    for type in proxy object container account; do
+        screen_stop s-${type}
+    done
+    # Blast out any stragglers
    pkill -f swift-
 }