3 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp
index c108c3c86a..6994c7a400 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -53,7 +53,8 @@ void Connection::open(
     const std::string& vhost,
     uint16_t maxFrameSize)
 {
-    ConnectionSettings settings;
+    // FIXME aconway 2008-06-02: refactor ConnectionSettings to separate out command line parsing.
+    ConnectionSettings settings(""); 
     settings.host = host;
     settings.port = port;
     settings.username = uid;
diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/cpp/src/qpid/client/ConnectionSettings.cpp
index 998e1c4636..26a11c3b9d 100644
--- a/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/cpp/src/qpid/client/ConnectionSettings.cpp
@@ -29,7 +29,7 @@
 namespace qpid {
 namespace client {
 
-ConnectionSettings::ConnectionSettings() :
+ConnectionSettings::ConnectionSettings(const std::string& argv0) :
     Options("Connection Settings"),
     host("localhost"), 
     port(TcpAddress::DEFAULT_PORT),
@@ -42,7 +42,8 @@ ConnectionSettings::ConnectionSettings() :
     maxChannels(32767),
     maxFrameSize(65535),
     bounds(2),
-    tcpNoDelay(false)
+    tcpNoDelay(false),
+    log(argv0)
 {
     addOptions()
         ("broker,b", optValue(host, "HOST"), "Broker host to connect to") 
@@ -65,7 +66,7 @@ ConnectionSettings::~ConnectionSettings() {}
 void ConnectionSettings::parse(int argc, char** argv) 
 {
     qpid::Options::parse(argc, argv);
-    qpid::log::Logger::instance().configure(log, argv[0]);
+    qpid::log::Logger::instance().configure(log);
 }
 
 
diff --git a/cpp/src/qpid/client/ConnectionSettings.h b/cpp/src/qpid/client/ConnectionSettings.h
index 8db5c0578c..d35b8bc0e7 100644
--- a/cpp/src/qpid/client/ConnectionSettings.h
+++ b/cpp/src/qpid/client/ConnectionSettings.h
@@ -37,9 +37,9 @@ namespace client {
  * Used to hold seetings for a connection (and parse these from
  * command line options etc if desired).
  */
-struct ConnectionSettings : qpid::Options, qpid::sys::Socket::Configuration
-{
-    ConnectionSettings();
+struct ConnectionSettings : qpid::Options, qpid::sys::Socket::Configuration {
+    // FIXME aconway 2008-06-02: separate option parsing from settings as subclass.
+    ConnectionSettings(const std::string& argv0=std::string());
     virtual ~ConnectionSettings();
 
     /**