diff options
Diffstat (limited to 'qpid/cpp/src/qpidd.cpp')
| -rw-r--r-- | qpid/cpp/src/qpidd.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp index 6c20ebc58f..444283b067 100644 --- a/qpid/cpp/src/qpidd.cpp +++ b/qpid/cpp/src/qpidd.cpp @@ -48,9 +48,9 @@ struct ModuleOptions : public qpid::Options { ModuleOptions() : qpid::Options("Module options"), loadDir("/usr/lib/qpidd"), noLoad(false) { addOptions() - ("load-dir", optValue(loadDir, "DIR"), "Load all modules from this directory") - ("load-module", optValue(load, "FILE"), "Specifies additional module(s) to be loaded") - ("no-modules", optValue(noLoad), "Don't load any modules"); + ("module-dir", optValue(loadDir, "DIR"), "Load all .so modules in this directory") + ("load-module", optValue(load, "FILE"), "Specifies additional module(s) to be loaded") + ("no-module-dir", optValue(noLoad), "Don't load modules from module directory"); } }; @@ -188,12 +188,13 @@ int main(int argc, char* argv[]) // be re-parsed with all of the module-supplied options. bootOptions.parse (argc, argv, bootOptions.common.config, true); qpid::log::Logger::instance().configure(bootOptions.log, argv[0]); - if (!bootOptions.module.noLoad) { - for (vector<string>::iterator iter = bootOptions.module.load.begin(); - iter != bootOptions.module.load.end(); - iter++) - tryShlib (iter->data(), false); + for (vector<string>::iterator iter = bootOptions.module.load.begin(); + iter != bootOptions.module.load.end(); + iter++) + tryShlib (iter->data(), false); + + if (!bootOptions.module.noLoad) { bool isDefault = defaultPath == bootOptions.module.loadDir; loadModuleDir (bootOptions.module.loadDir, isDefault); } |