From 910fa22beb64c0c4d64221d9485830035c1663ff Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 7 Feb 2008 21:31:21 +0000 Subject: Clean shutdown of broker: Moved signal unsafe code from Broker::shutdown to ~Broker, moved shutdown logging from shutdown handler to main() in qpidd.cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619646 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Broker.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker') diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 57ff7a550c..1d55db0c0f 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -212,13 +212,16 @@ void Broker::run() { } void Broker::shutdown() { + // NB: this function must be async-signal safe, it must not + // call any function that is not async-signal safe. + // Any unsafe shutdown actions should be done in the destructor. if (acceptor) acceptor->shutdown(); - ManagementAgent::shutdown (); } Broker::~Broker() { shutdown(); + ManagementAgent::shutdown (); delete store; } -- cgit v1.2.1