|
version 1.185.2.1, 2006/07/27 23:12:18
|
version 1.186, 2006/08/04 19:06:02
|
|
|
|
| | |
| #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) | #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) |
| #include <Service/ARM_zOS.h> | #include <Service/ARM_zOS.h> |
| |
# ifdef PEGASUS_ZOS_SECURITY |
| |
// This include file will not be provided in the OpenGroup CVS for now. |
| |
// Do NOT try to include it in your compile |
| |
# include <Pegasus/Common/safCheckzOS_inline.h> |
| |
# endif |
| #endif | #endif |
| | |
| #if defined(PEGASUS_OS_TYPE_UNIX) | #if defined(PEGASUS_OS_TYPE_UNIX) |
|
|
|
| // needed to localize the exceptions thrown during CIM request processing. | // needed to localize the exceptions thrown during CIM request processing. |
| // Note: This function should never be called! | // Note: This function should never be called! |
| // | // |
| ThreadReturnType PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm) |
PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm) |
| { | { |
| return((ThreadReturnType)0); |
return((PEGASUS_THREAD_RETURN)0); |
| } | } |
| | |
| // | // |
|
|
|
| } | } |
| catch (UnrecognizedConfigProperty& e) | catch (UnrecognizedConfigProperty& e) |
| { | { |
| |
// UnrecognizedConfigProperty is already translated |
| #ifdef PEGASUS_OS_OS400 |
// thus, just output the message |
| //l10n |
Logger::put(Logger::ERROR_LOG, |
| //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
System::CIMSERVER, |
| //"Error: $0",e.getMessage()); |
Logger::SEVERE, |
| Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE, |
|
| "src.Server.cimserver.ERROR", |
|
| "Error: $0",e.getMessage()); |
|
| #else |
|
| //l10n |
|
| //cout << "Error: " << e.getMessage() << endl; |
|
| MessageLoaderParms parms("src.Server.cimserver.ERROR", |
|
| "Error: $0", |
|
| e.getMessage()); | e.getMessage()); |
| cout << MessageLoader::getMessage(parms) << endl; |
#ifndef PEGASUS_OS_OS400 |
| |
cout << e.getMessage() << endl; |
| |
#endif |
| |
} |
| |
catch (Exception& ex) |
| |
{ |
| |
Logger::put(Logger::ERROR_LOG, |
| |
System::CIMSERVER, |
| |
Logger::SEVERE, |
| |
ex.getMessage()); |
| |
#ifndef PEGASUS_OS_OS400 |
| |
cout << ex.getMessage() << endl; |
| #endif | #endif |
| |
exit(1); |
| } | } |
| | |
| |
#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) && defined(PEGASUS_ZOS_SECURITY) |
| |
startupCheckBPXServer(true); |
| |
startupCheckProfileCIMSERVclassWBEM(); |
| |
startupEnableMSC(); |
| |
#endif |
| |
|
| // Bug 2148 - Here is the order of operations for determining the server HTTP and HTTPS ports. | // Bug 2148 - Here is the order of operations for determining the server HTTP and HTTPS ports. |
| // 1) If the user explicitly specified a port, use it. | // 1) If the user explicitly specified a port, use it. |
| // 2) If the user did not specify a port, get the port from the services file. | // 2) If the user did not specify a port, get the port from the services file. |
Return to
cimserver.cpp
CVS log
Up to [Pegasus] / pegasus / src / Server