|
version 1.192, 2007/02/23 18:56:32
|
version 1.193, 2007/03/13 17:51:14
|
|
|
|
| void GetOptions( | void GetOptions( |
| ConfigManager* cm, | ConfigManager* cm, |
| int& argc, | int& argc, |
| char** argv) |
char** argv, |
| |
const Boolean& shutdownOption) |
| { | { |
| try | try |
| { | { |
| |
if (shutdownOption) |
| |
{ |
| |
cm->loadConfigFiles(); |
| |
} |
| |
else |
| |
{ |
| cm->mergeConfigFiles(); | cm->mergeConfigFiles(); |
| |
} |
| |
|
| |
// Temporarily disable updates to the current configuration |
| |
// file if shutdownOption is true |
| |
cm->useConfigFiles = (shutdownOption==false); |
| | |
| cm->mergeCommandLine(argc, argv); | cm->mergeCommandLine(argc, argv); |
| |
|
| |
// Enable updates again |
| |
cm->useConfigFiles = true; |
| } | } |
| catch (NoSuchFile&) | catch (NoSuchFile&) |
| { | { |
|
|
|
| #ifdef PEGASUS_OS_OS400 | #ifdef PEGASUS_OS_OS400 |
| if (os400StartupOption == false) | if (os400StartupOption == false) |
| #endif | #endif |
| GetOptions(configManager, argc, argv); |
// If current process is "cimserver -s" (shutdown option = true) the contents |
| |
// of current config should not be overwriten by planned config |
| |
GetOptions(configManager, argc, argv, shutdownOption); |
| } | } |
| catch (Exception& e) | catch (Exception& e) |
| { | { |
Return to
cimserver.cpp
CVS log
Up to [Pegasus] / pegasus / src / Server