From bd32abf9bc9d628f6fed510c223689de9aa8b76d Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 30 Jan 2012 18:29:04 -0500
Subject: Clear out RPC connection pool before exit.

Fixes bug 767984.

This patch ensures that pooled connections to a messaging system get
cleaned up before a process that has used the RPC API exits.

Change-Id: I56eca54334075378534a7a5d3434c420319672b4
---
 bin/nova-dhcpbridge | 3 +++
 bin/nova-manage     | 1 +
 2 files changed, 4 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index e5ce64c11..ae77fc7b1 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -125,5 +125,8 @@ def main():
 
         print init_leases(network_id)
 
+    rpc.cleanup()
+
+
 if __name__ == "__main__":
     main()
diff --git a/bin/nova-manage b/bin/nova-manage
index 1275d72d9..b899dab40 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -2354,6 +2354,7 @@ def main():
     # call the action with the remaining arguments
     try:
         fn(*fn_args, **fn_kwargs)
+        rpc.cleanup()
         sys.exit(0)
     except TypeError:
         print _("Possible wrong number of arguments supplied")
-- 
cgit