version 1.104, 2003/09/08 14:50:34
|
version 1.113, 2003/10/10 15:34:27
|
|
|
//"Failed to shutdown server: $0", "The repository may be empty."); | //"Failed to shutdown server: $0", "The repository may be empty."); |
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, | Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
"src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY", | "src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY", |
"Failed to shutdown server: The repository may be empty."); |
"Error in server shutdown: The repository may be empty."); |
} | } |
else | else |
{ | { |
|
|
//"Failed to shutdown server: $0", e.getMessage()); | //"Failed to shutdown server: $0", e.getMessage()); |
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, | Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
"src.Server.cimserver.SHUTDOWN_FAILED", | "src.Server.cimserver.SHUTDOWN_FAILED", |
"Failed to shutdown server: $0", e.getMessage()); |
"Error in server shutdown: $0", e.getMessage()); |
} | } |
// Kill the server job. | // Kill the server job. |
if(cimserver_kill() == -1) | if(cimserver_kill() == -1) |
cimserver_exit(2); | cimserver_exit(2); |
#else | #else |
//l10n |
//l10n - TODO |
//PEGASUS_STD(cerr) << "Failed to shutdown server: "; |
|
MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED", | MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED", |
"Failed to shutdown server: "); |
"Error in server shutdown: "); |
PEGASUS_STD(cerr) << MessageLoader::getMessage(parms); | PEGASUS_STD(cerr) << MessageLoader::getMessage(parms); |
if (e.getCode() == CIM_ERR_INVALID_NAMESPACE) | if (e.getCode() == CIM_ERR_INVALID_NAMESPACE) |
{ | { |
//PEGASUS_STD(cerr) << "The repository may be empty."; |
// |
//PEGASUS_STD(cerr) << PEGASUS_STD(endl); |
// Repository may be empty. |
|
// |
|
//l10n - TODO |
|
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
"src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY", |
|
"Error in server shutdown: The repository may be empty."); |
MessageLoaderParms parms("src.Server.cimserver.REPOSITORY_EMPTY", | MessageLoaderParms parms("src.Server.cimserver.REPOSITORY_EMPTY", |
"The repository may be empty."); | "The repository may be empty."); |
PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl); | PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl); |
} | } |
else | else |
{ | { |
|
//l10n - TODO |
|
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
"src.Server.cimserver.SHUTDOWN_FAILED", |
|
"Error in server shutdown: $0", e.getMessage()); |
PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl); | PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl); |
} | } |
|
|
|
// Kill the cimserver process |
|
if (cimserver_kill() == 0) |
|
{ |
|
//l10n - TODO |
|
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
"src.Server.cimserver.SERVER_FORCED_SHUTDOWN", |
|
"Forced shutdown initiated."); |
|
MessageLoaderParms parms("src.Server.cimserver.SERVER_FORCED_SHUTDOWN", |
|
"Forced shutdown initiated."); |
|
PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl); |
|
} |
#endif | #endif |
cimserver_exit(1); | cimserver_exit(1); |
| |
|
|
if (running) | if (running) |
{ | { |
int kill_rc = cimserver_kill(); | int kill_rc = cimserver_kill(); |
|
|
#ifdef PEGASUS_OS_OS400 | #ifdef PEGASUS_OS_OS400 |
if(kill_rc == -1) | if(kill_rc == -1) |
cimserver_exit(2); | cimserver_exit(2); |
|
|
#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) | #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) |
if (kill_rc != -1) | if (kill_rc != -1) |
{ | { |
//l10n |
//l10n - TODO |
//cout << "Shutdown timeout expired. CIM Server process killed." << endl; |
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
"src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED", |
|
"Shutdown timeout expired. Forced shutdown initiated."); |
MessageLoaderParms parms("src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED", | MessageLoaderParms parms("src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED", |
"Shutdown timeout expired. CIM Server process killed."); |
"Shutdown timeout expired. Forced shutdown initiated."); |
cout << MessageLoader::getMessage(parms) << endl; | cout << MessageLoader::getMessage(parms) << endl; |
exit(0); | exit(0); |
} | } |
|
|
//l10n | //l10n |
//cout << "CIM Server stopped." << endl; | //cout << "CIM Server stopped." << endl; |
MessageLoaderParms parms("src.Server.cimserver.SERVER_STOPPED", | MessageLoaderParms parms("src.Server.cimserver.SERVER_STOPPED", |
"$0 Server stopped.", |
"CIM Server stopped."); |
"CIM"); |
|
cout << MessageLoader::getMessage(parms) << endl; | cout << MessageLoader::getMessage(parms) << endl; |
#endif | #endif |
cimserver_exit(0); | cimserver_exit(0); |
|
|
// The run function for the dummy Thread should never be called, | // The run function for the dummy Thread should never be called, |
Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false); | Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false); |
Thread::setCurrent(dummyInitialThread); | Thread::setCurrent(dummyInitialThread); |
AcceptLanguages default_al = AcceptLanguages::getDefaultAcceptLanguages(); |
AcceptLanguages default_al; |
|
try{ |
|
default_al = AcceptLanguages::getDefaultAcceptLanguages(); |
Thread::setLanguages(new AcceptLanguages(default_al)); | Thread::setLanguages(new AcceptLanguages(default_al)); |
|
}catch(InvalidAcceptLanguageHeader e){ |
|
Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
"src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE", |
|
"Could not convert the system process locale into a valid AcceptLanguage format."); |
|
Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
e.getMessage()); |
|
} |
|
|
| |
| |
#ifdef PEGASUS_OS_OS400 | #ifdef PEGASUS_OS_OS400 |
|
|
//cout << "CIMServer is already running." << endl; | //cout << "CIMServer is already running." << endl; |
MessageLoaderParms parms("src.Server.cimserver.UNABLE_TO_START_SERVER_ALREADY_RUNNING", | MessageLoaderParms parms("src.Server.cimserver.UNABLE_TO_START_SERVER_ALREADY_RUNNING", |
"Unable to start CIMServer.\nCIMServer is already running."); | "Unable to start CIMServer.\nCIMServer is already running."); |
|
PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl); |
| |
// | // |
// notify parent process (if there is a parent process) to terminate | // notify parent process (if there is a parent process) to terminate |
|
|
serviceURL.append(slp_address); | serviceURL.append(slp_address); |
#endif | #endif |
| |
Monitor monitor(true); |
|
//monitor_2 monitor; |
|
| |
CIMServer server(&monitor); |
|
| |
| |
|
#if defined(PEGASUS_OS_OS400) || defined(PEGASUS_MONITOR2) |
|
CIMServer server(monitor_2::get_monitor2()); |
|
#else |
|
|
|
Monitor monitor(true); |
|
CIMServer server(&monitor); |
|
#endif |
|
|
| |
if (enableHttpConnection) | if (enableHttpConnection) |
{ | { |
|
|
} | } |
#endif | #endif |
server.runForever(); | server.runForever(); |
} |
|
| |
|
} |
|
MessageQueueService::force_shutdown(true); |
// | // |
// normal termination | // normal termination |
// | // |