From d68f4fc71cd9b7db52779e0358b6830828834076 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Wed, 27 Jan 2010 22:06:52 +0000 Subject: Write the correct port number to stdout when starting up. Resolves QPID-2366. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903862 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/windows/QpiddBroker.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/windows/QpiddBroker.cpp b/cpp/src/windows/QpiddBroker.cpp index 15380dda0b..e221551575 100644 --- a/cpp/src/windows/QpiddBroker.cpp +++ b/cpp/src/windows/QpiddBroker.cpp @@ -210,17 +210,17 @@ struct BrokerInfo { struct ProcessControlOptions : public qpid::Options { bool quit; bool check; - //std::string transport; No transport options yet - TCP is it. + std::string transport; ProcessControlOptions() : qpid::Options("Process control options"), quit(false), - check(false) //, transport(TCP) + check(false), + transport(TCP) { - // Only have TCP for now, so don't need this... - // ("transport", optValue(transport, "TRANSPORT"), "The transport for which to return the port") addOptions() ("check,c", qpid::optValue(check), "Prints the broker's process ID to stdout and returns 0 if the broker is running, otherwise returns 1") + ("transport", qpid::optValue(transport, "TRANSPORT"), "The transport for which to return the port") ("quit,q", qpid::optValue(quit), "Tells the broker to shut down"); } }; @@ -283,7 +283,7 @@ int QpiddBroker::execute (QpiddOptions *options) { // Need the correct port number to use in the pid file name. if (options->broker.port == 0) - options->broker.port = brokerPtr->getPort(""); + options->broker.port = brokerPtr->getPort(myOptions->control.transport); BrokerInfo info; info.pid = ::GetCurrentProcessId(); -- cgit v1.2.1