diff options
| author | Ted Ross <tross@apache.org> | 2012-04-20 20:43:14 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-04-20 20:43:14 +0000 |
| commit | 48ca9982f8a1697bc47dc253c5656382bc4e3691 (patch) | |
| tree | cda3fa7873758125671aaf7f8c1d11c45993364d | |
| parent | 97dbae38a624237e72ddf2752f0bcf5a879e0de2 (diff) | |
| download | qpid-python-48ca9982f8a1697bc47dc253c5656382bc4e3691.tar.gz | |
QPID-3510 - Allow client configuration-file to be overridden via QPID_CONFIG env variable.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1328494 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/client/ConnectionImpl.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/client/LoadPlugins.cpp | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/client/SslConnector.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp index db97f1e0f4..963e56b9b2 100644 --- a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp +++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp @@ -115,8 +115,10 @@ public: ioThreads(0), connections(0) { + CommonOptions common("", QPIDC_CONF_FILE); IOThreadOptions options(c); - options.parse(0, 0, QPIDC_CONF_FILE, true); + common.parse(0, 0, common.config, true); + options.parse(0, 0, common.config, true); maxIOThreads = (options.maxIOThreads != -1) ? options.maxIOThreads : 1; } diff --git a/qpid/cpp/src/qpid/client/LoadPlugins.cpp b/qpid/cpp/src/qpid/client/LoadPlugins.cpp index 246eb60c67..a8cfe80dc8 100644 --- a/qpid/cpp/src/qpid/client/LoadPlugins.cpp +++ b/qpid/cpp/src/qpid/client/LoadPlugins.cpp @@ -39,10 +39,12 @@ namespace { struct LoadtimeInitialise { LoadtimeInitialise() { + CommonOptions common("", QPIDC_CONF_FILE); qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR); string defaultPath (moduleOptions.loadDir); - moduleOptions.parse (0, 0, QPIDC_CONF_FILE, true); - + common.parse(0, 0, common.config, true); + moduleOptions.parse (0, 0, common.config, true); + for (vector<string>::iterator iter = moduleOptions.load.begin(); iter != moduleOptions.load.end(); iter++) diff --git a/qpid/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp index 6b6bf884ec..70f1b6725f 100644 --- a/qpid/cpp/src/qpid/client/SslConnector.cpp +++ b/qpid/cpp/src/qpid/client/SslConnector.cpp @@ -148,8 +148,10 @@ namespace { struct StaticInit { StaticInit() { try { + CommonOptions common("", QPIDC_CONF_FILE); SslOptions options; - options.parse (0, 0, QPIDC_CONF_FILE, true); + common.parse(0, 0, common.config, true); + options.parse (0, 0, common.config, true); if (options.certDbPath.empty()) { QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it."); } else { |