pegasus/src/Server/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.183 and 1.188

version 1.183, 2006/04/26 09:58:39

version 1.188, 2006/08/09 21:13:10

Line 51

// David Dillard, VERITAS Software Corp.

// (david.dillard@veritas.com)

// Aruran, IBM (aruran.shanmug@in.ibm.com) for Bug# 4183, 4937

// Thilo Boehm, IBM (tboehm@de.ibm.com)

//%/////////////////////////////////////////////////////////////////////////////

Line 126

Line 127

# include "OS400ConvertChar.h"

#endif

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

#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

#if defined(PEGASUS_OS_TYPE_UNIX)

# if defined(PEGASUS_OS_OS400)

# include <unistd.cleinc>

Line 200

Line 210

return PEGASUS_PROCESS_NAME;

}

//defined in ConfigFileDir.h

//defined in Constants.h

virtual const char* getPIDFileName() const

{

return CIMSERVER_START_FILE;

return PEGASUS_CIMSERVER_START_FILE;

}

int cimserver_run(

Line 378

Line 388

// needed to localize the exceptions thrown during CIM request processing.

// Note: This function should never be called!

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm)

ThreadReturnType PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm)

{

return((PEGASUS_THREAD_RETURN)0);

return((ThreadReturnType)0);

}

Line 933

Line 943

if (os400StartupOption == false)

{

enableHttpConnection = String::equal(

enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"), "true");

configManager->getCurrentValue("enableHttpConnection"));

enableHttpsConnection = String::equal(

enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"), "true");

configManager->getCurrentValue("enableHttpsConnection"));

enableSSLExportClientVerification = String::equal(

enableSSLExportClientVerification = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableSSLExportClientVerification"), "true");

configManager->getCurrentValue("enableSSLExportClientVerification"));

}

#else

Boolean enableHttpConnection = String::equal(

Boolean enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"), "true");

configManager->getCurrentValue("enableHttpConnection"));

Boolean enableHttpsConnection = String::equal(

Boolean enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"), "true");

configManager->getCurrentValue("enableHttpsConnection"));

Boolean enableSSLExportClientVerification = String::equal(

Boolean enableSSLExportClientVerification =

configManager->getCurrentValue("enableSSLExportClientVerification"), "true");

ConfigManager::parseBooleanValue(configManager->getCurrentValue(

"enableSSLExportClientVerification"));

#endif

// Make sure at least one connection is enabled

Line 972

Line 983

try

{

// Check to see if we should Pegasus as a daemon

// Check to see if we should start Pegasus as a daemon

if (String::equal(configManager->getCurrentValue("daemon"), "true"))

daemonOption = ConfigManager::parseBooleanValue(

{

configManager->getCurrentValue("daemon"));

daemonOption = true;

}

#ifdef PEGASUS_OS_OS400

if (os400StartupOption == false)

Line 1050

Line 1059

}

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());

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

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.

// 1) If the user explicitly specified a port, use it.

Line 1480

Line 1499

}

#endif

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

// ARM is a z/OS internal restart facility.

// This is a z/OS specific change.

// Instatiating the automatic restart manager for zOS

ARM_zOS automaticRestartManager;

// register to zOS ARM

automaticRestartManager.Register();

#endif

// Loop to call CIMServer's runForever() method until CIMServer

// has been shutdown

Line 1494

Line 1528

// normal termination

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

// ARM is a z/OS internal restart facility.

// This is a z/OS specific change.

// register to zOS ARM

automaticRestartManager.DeRegister();

#endif

// Put server shutdown message to the logger

Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,

Legend:

Removed from v.1.183
changed lines
	Added in v.1.188

No CVS admin address has been configured