You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/10/23 02:23:31 UTC
svn commit: r828898 - /qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Author: shuston
Date: Fri Oct 23 00:23:30 2009
New Revision: 828898
URL: http://svn.apache.org/viewvc?rev=828898&view=rev
Log:
Get selected TCP listen port before building the pid file name; fixes regression introduced yesterday.
Modified:
qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp?rev=828898&r1=828897&r2=828898&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp Fri Oct 23 00:23:30 2009
@@ -239,6 +239,9 @@
": " +
qpid::sys::strError(err)));
}
+ // Need the correct port number to use in the pid file name.
+ if (options->broker.port == 0)
+ options->broker.port = brokerPtr->getPort("");
qpid::sys::LockFile myPid(brokerPidFile(myOptions->control.piddir,
options->broker.port),
true);
@@ -251,8 +254,6 @@
ShutdownHandler waitShut(brokerPtr);
qpid::sys::Thread waitThr(waitShut); // Wait for shutdown event
SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
- if (options->broker.port == 0)
- options->broker.port = brokerPtr->getPort("");
brokerPtr->accept();
std::cout << options->broker.port << std::endl;
brokerPtr->run();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org