pegasus/src/WMIMapper/WMIServer/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / WMIMapper / WMIServer

Diff for /pegasus/src/WMIMapper/WMIServer/cimserver.cpp between version 1.30 and 1.41

version 1.30, 2007/05/08 18:30:53

version 1.41, 2008/12/01 17:52:04

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a

// copy of this software and associated documentation files (the "Software"),

// EMC Corporation; Symantec Corporation; The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// Permission is hereby granted, free of charge, to any person obtaining a copy

// and/or sell copies of the Software, and to permit persons to whom the

// of this software and associated documentation files (the "Software"), to

// Software is furnished to do so, subject to the following conditions:

// deal in the Software without restriction, including without limitation the

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// The above copyright notice and this permission notice shall be included

// sell copies of the Software, and to permit persons to whom the Software is

// in all copies or substantial portions of the Software.

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

//////////////////////////////////////////////////////////////////////////

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

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

//////////////////////////////////////////////////////////////////////

Line 85

Line 83

#include <Pegasus/Common/PegasusAssert.h>

#include <fstream>

#include <Pegasus/Common/FileSystem.h>

#include <Pegasus/Common/Monitor.h>

#include <Pegasus/Common/PegasusVersion.h>

#include <Pegasus/Common/Logger.h>

#include <Pegasus/Common/System.h>

Line 98

Line 95

#include <Service/ServerShutdownClient.h>

#include <Service/ServerRunStatus.h>

#if defined(PEGASUS_OS_OS400)

# include "vfyptrs.cinc"

# include "OS400ConvertChar.h"

#endif

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

Line 157

Line 149

return PEGASUS_PROCESS_NAME;

}

//defined in Constants.h

int cimserver_run(

virtual const char* getPIDFileName() const

int argc,

{

char** argv,

return PEGASUS_CIMSERVER_START_FILE;

Boolean shutdownOption,

}

Boolean debugOutputOption);

int cimserver_run(int argc, char** argv, bool shutdownOption);

void cimserver_stop(void);

};

Line 172

Line 162

PEGASUS_PROCESS_NAME, PEGASUS_CIMSERVER_START_FILE);

AutoPtr<CIMServerProcess> _cimServerProcess(new CIMServerProcess());

static CIMServer* _cimServer = 0;

static Monitor* _monitor = 0;

// The command name.

Line 203

Line 192

static const char OPTION_BINDVERBOSE = 'X';

#endif

static const String PROPERTY_TIMEOUT = "shutdownTimeout";

ConfigManager* configManager;

/** GetOptions function - This function defines the Options Table

and sets up the options from that table using the config manager.

Line 240

Line 225

usage.append (" -D [home] - sets pegasus home directory\n");

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

usage.append (" -install [name] - installs pegasus as a Windows Service\n");

usage.append (" -install [name] - installs pegasus as a Windows "

usage.append (" [name] is optional and overrides the\n");

"Service\n");

usage.append (" [name] is optional and overrides "

"the\n");

usage.append (" default CIM Server Service Name\n");

usage.append (" -remove [name] - removes pegasus as a Windows Service\n");

usage.append (" -remove [name] - removes pegasus as a Windows "

usage.append (" [name] is optional and overrides the\n");

"Service\n");

usage.append (" [name] is optional and overrides "

"the\n");

usage.append (" default CIM Server Service Name\n");

usage.append (" -start [name] - starts pegasus as a Windows Service\n");

usage.append (" -start [name] - starts pegasus as a Windows "

usage.append (" [name] is optional and overrides the\n");

"Service\n");

usage.append (" [name] is optional and overrides "

"the\n");

usage.append (" default CIM Server Service Name\n");

usage.append (" -stop [name] - stops pegasus as a Windows Service\n");

usage.append (" -stop [name] - stops pegasus as a Windows "

usage.append (" [name] is optional and overrides the\n");

"Service\n");

usage.append (" [name] is optional and overrides "

"the\n");

usage.append (" default CIM Server Service Name\n\n");

#endif

usage.append (" configProperty=value\n");

usage.append (" - sets CIM Server configuration property\n");

usage.append (" - sets CIM Server configuration "

"property\n");

cout << endl;

cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;

cout << _cimServerProcess->getProductName() << " " <<

_cimServerProcess->getVersion() << endl;

cout << endl;

#if defined(PEGASUS_OS_TYPE_WINDOWS)

MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS", usage);

#elif defined(PEGASUS_USE_RELEASE_DIRS)

MessageLoaderParms parms("src.Server.cimserver.MENU.HPUXLINUXIA64GNU", usage);

MessageLoaderParms parms(

"src.Server.cimserver.MENU.HPUXLINUXIA64GNU", usage);

#else

MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD", usage);

#endif

cout << MessageLoader::getMessage(parms) << endl;

}

//This needs to be called at various points in the code depending on the platform and error conditions.

// This needs to be called at various points in the code depending on the

//We need to delete the _cimServer reference on exit in order for the destructors to get called.

// platform and error conditions. We need to delete the _cimServer

// reference on exit in order for the destructors to get called.

void deleteCIMServer()

{

if (_cimServer)

{

delete _cimServer;

_cimServer = 0;

}

if (_monitor)

{

delete _monitor;

}

// l10n

// Dummy function for the Thread object associated with the initial thread.

Line 306

Line 295

{

String pegasusHome;

Boolean shutdownOption = false;

Boolean debugOutputOption = false;

//l10n

// Set Message loading to process locale

Line 317

Line 307

setlocale(LC_ALL, "");

#endif

#ifdef PEGASUS_OS_OS400

VFYPTRS_INCDCL; // VFYPTRS local variables

// verify pointers

#pragma exception_handler (qsyvp_excp_hndlr,qsyvp_excp_comm_area,\

0,_C2_MH_ESCAPE)

for( int arg_index = 1; arg_index < argc; arg_index++ ){

VFYPTRS(VERIFY_SPP_NULL(argv[arg_index]));

}

#pragma disable_handler

// Convert the args to ASCII

for(Uint32 i = 0;i< argc;++i)

{

EtoA(argv[i]);

}

// Initialize Pegasus home to the shipped OS/400 directory.

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

// Get environment variables:

#ifdef PEGASUS_OS_OS400

#pragma convert(37)

const char* tmp = getenv("PEGASUS_HOME");

#pragma convert(0)

char home[256] = {0};

if (tmp && strlen(tmp) < 256)

{

strcpy(home, tmp);

EtoA(home);

pegasusHome = home;

}

#else

#if defined(PEGASUS_OS_AIX) && defined(PEGASUS_USE_RELEASE_DIRS)

pegasusHome = AIX_RELEASE_PEGASUS_HOME;

#elif !defined(PEGASUS_USE_RELEASE_DIRS)

Line 366

Line 321

pegasusHome = tmp;

}

#endif

FileSystem::translateSlashes(pegasusHome);

#else

Line 425

Line 379

}

else

{

//l10n

//cout << "Missing argument for option -" << option << endl;

String opt(option);

MessageLoaderParms parms("src.Server.cimserver.MISSING_ARGUMENT",

MessageLoaderParms parms(

"src.Server.cimserver.MISSING_ARGUMENT",

"Missing argument for option -$0",

opt);

cout << MessageLoader::getMessage(parms) << endl;

exit(0);

}

memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));

memmove(&argv[i], &argv[i + 2],

(argc-i-1) * sizeof(char*));

argc -= 2;

}

#endif

Line 447

Line 401

(strlen(option) == 1))

{

System::bindVerbose = true;

//l10n

//cout << "Unsupported debug option, BIND_VERBOSE, enabled."

MessageLoaderParms parms(

//<< endl;

"src.Server.cimserver.UNSUPPORTED_DEBUG_OPTION",

MessageLoaderParms parms("src.Server.cimserver.UNSUPPORTED_DEBUG_OPTION",

"Unsupported debug option, BIND_VERBOSE, enabled.");

cout << MessageLoader::getMessage(parms) << endl;

// remove the option from the command line

Line 469

Line 422

if (shutdownOption)

{

//l10n

MessageLoaderParms parms(

//cout << "Duplicate shutdown option specified." << endl;

"src.Server.cimserver.DUPLICATE_SHUTDOWN_OPTION",

MessageLoaderParms parms("src.Server.cimserver.DUPLICATE_SHUTDOWN_OPTION",

"Duplicate shutdown option specified.");

cout << MessageLoader::getMessage(parms) << endl;

Line 500

Line 452

// Do the plaform specific run

return _cimServerProcess->platform_run( argc, argv, shutdownOption );

return _cimServerProcess->platform_run(

argc, argv, shutdownOption, debugOutputOption);

}

void CIMServerProcess::cimserver_stop()

Line 521

Line 474

// specific runs may need to deal with bettter (instead of exit(), etc).

int CIMServerProcess::cimserver_run( int argc, char** argv, Boolean shutdownOption )

int CIMServerProcess::cimserver_run(

int argc,

char** argv,

Boolean shutdownOption,

Boolean debugOutputOption)

{

String logsDirectory;

Boolean daemonOption = false;

Line 529

Line 486

// Get an instance of the Config Manager.

configManager = ConfigManager::getInstance();

ConfigManager* configManager = ConfigManager::getInstance();

configManager->useConfigFiles = true;

#ifdef PEGASUS_OS_OS400

// In a special startup case for IBM OS400, when the server is

// automatically started when the machine starts up the config

// file cannot be read because of access restrictions for the

// user starting the server. In this case, we need to skip

// reading the config options and therefore any use of the config

// manager also. To make this determinations we will check to see

// if the daemon flag is set to true. If so, then there will be a

// series of checks to bracket all the calls to the configManager

// which would otherwise fail. All this will only be done for

// IBM OS400.

Boolean os400StartupOption = false;

// loop through args to check for daemon=true

for (int i=1; i < argc; i++)

if (strcmp(argv[i], "daemon=true") == 0)

{

os400StartupOption = true;

daemonOption = true;

}

#endif

// Get options (from command line and from configuration file); this

// removes corresponding options and their arguments from the command

Line 561

Line 496

try

{

#ifdef PEGASUS_OS_OS400

if (os400StartupOption == false)

#endif

GetOptions(configManager, argc, argv);

}

catch (Exception& e)

{

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

"src.Server.cimserver.SERVER_NOT_STARTED",

"cimserver not started: $0", e.getMessage());

#if !defined(PEGASUS_OS_OS400)

MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",

"cimserver not started: $0", e.getMessage());

PEGASUS_STD(cerr) << argv[0] << ": " << MessageLoader::getMessage(parms)

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

<< PEGASUS_STD(endl);

parms);

#endif

PEGASUS_STD(cerr) << argv[0] << ": " <<

MessageLoader::getMessage(parms) << PEGASUS_STD(endl);

return(1);

}

Line 590

Line 519

MessageLoader::setPegasusMsgHome(ConfigManager::getHomedPath(

ConfigManager::getInstance()->getCurrentValue("messageDir")));

#ifdef PEGASUS_OS_OS400

// Still need to declare and set the connection variables.

// Will initialize to false since they are fixed at false for OS400.

// NOTE: OS400 is a LOCAL_DOMAIN_SOCKET, so a few lines down

// the test will not be compiled in. If OS400 ever turns off that

// define, then we will need to change this code path to insure that

// one of the variables is true.

Boolean enableHttpConnection = false;

Boolean enableHttpsConnection = false;

if (os400StartupOption == false)

{

enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"));

enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"));

}

#else

Boolean enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"));

Boolean enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"));

#endif

// Make sure at least one connection is enabled

#ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

if (!enableHttpConnection && !enableHttpsConnection)

{

//l10n

MessageLoaderParms parms(

//Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,

//"Neither HTTP nor HTTPS connection is enabled. "

//"CIMServer will not be started.");

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

"src.Server.cimserver.HTTP_NOT_ENABLED_SERVER_NOT_STARTING",

"Neither HTTP nor HTTPS connection is enabled. CIMServer will not be started.");

"Neither HTTP nor HTTPS connection is enabled.");

//cerr << "Neither HTTP nor HTTPS connection is enabled. "

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

//"CIMServer will not be started." << endl;

parms);

MessageLoaderParms parms("src.Server.cimserver.HTTP_NOT_ENABLED_SERVER_NOT_STARTING",

"Neither HTTP nor HTTPS connection is enabled. CIMServer will not be started.");

cerr << MessageLoader::getMessage(parms) << endl;

return(1);

return 1;

}

#endif

Line 644

Line 547

daemonOption = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("daemon"));

#ifdef PEGASUS_OS_OS400

if (os400StartupOption == false)

{

#endif

logsDirectory =

ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));

#ifdef PEGASUS_OS_OS400

} // end if (os400StartupOption == false)

#endif

// Set up the Logger. This does not open the logs

// Might be more logical to clean before set.

// ATTN: Need tool to completely disable logging.

#if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \

#if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

!defined(PEGASUS_OS_OS400)

Logger::setHomeDirectory(logsDirectory);

#endif

Line 670

Line 565

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

Uint32 timeoutValue = strtol(configTimeout.getCString(), (char **)0, 10);

Uint32 timeoutValue = strtol(

configTimeout.getCString(), (char **)0, 10);

ServerShutdownClient serverShutdownClient(&_serverRunStatus);

serverShutdownClient.shutdown(timeoutValue);

#ifdef PEGASUS_OS_OS400

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,

"src.Server.cimserver.SERVER_STOPPED",

"CIM Server stopped.");

cimserver_exitRC(0);

#else

MessageLoaderParms parms(

"src.Server.cimserver.SERVER_STOPPED",

"CIM Server stopped.");

cout << MessageLoader::getMessage(parms) << endl;

return(0);

#endif

}

#if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS)

Line 699

Line 588

}

catch (UnrecognizedConfigProperty& e)

{

#ifdef PEGASUS_OS_OS400

//l10n

//Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

//"Error: $0",e.getMessage());

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;

#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.

// 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

// 3) If no value is specified in the services file, use the IANA WBEM default port.

// services file.

// 3) If no value is specified in the services file, use the IANA WBEM

// default port.

// Note that 2 and 3 are done within the System::lookupPort method

// An empty string from the ConfigManager implies that the user did not specify a port.

// An empty string from the ConfigManager implies that the user did

// not specify a port.

Uint32 portNumberHttps=0;

Uint32 portNumberHttp=0;

Line 736

Line 619

// Look up the WBEM-HTTPS port number

portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);

portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME,

WBEM_DEFAULT_HTTPS_PORT);

} else

{

Line 763

Line 647

// Look up the WBEM-HTTP port number

portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);

portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME,

WBEM_DEFAULT_HTTP_PORT);

} else

{

Line 784

Line 669

#if defined(PEGASUS_DEBUG)

// Put out startup up message.

cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;

cout << _cimServerProcess->getProductName() << " " <<

//l10n

_cimServerProcess->getVersion() << endl;

//cout << "Built " << __DATE__ << " " << __TIME__ << endl;

//cout <<"Starting..."

MessageLoaderParms parms("src.Server.cimserver.STARTUP_MESSAGE",

"Built $0 $1\nStarting...",

__DATE__,

__TIME__);

#endif

//l10n

// reset message loading to NON-process locale

MessageLoader::_useProcessLocale = false;

//l10n

// Get the parent's PID before forking

_serverRunStatus.setParentPid(System::getPID());

Line 806

Line 683

if (daemonOption)

{

if(-1 == _cimServerProcess->cimserver_fork())

#ifndef PEGASUS_OS_OS400

{

return(-1);

}

#else

{

return(-1);

}

else

{

return(0);

}

#endif

}

// l10n

Line 832

Line 698

// The run function for the dummy Thread should never be called,

Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);

Thread::setCurrent(dummyInitialThread);

AcceptLanguageList default_al;

try

try{

{

default_al = LanguageParser::getDefaultAcceptLanguages();

Thread::setLanguages(LanguageParser::getDefaultAcceptLanguages());

Thread::setLanguages(new AcceptLanguageList(default_al));

}

}catch(InvalidAcceptLanguageHeader& e){

catch(InvalidAcceptLanguageHeader& e)

{

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

MessageLoaderParms(

"src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",

"Could not convert the system process locale into a valid AcceptLanguage format.");

"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

// Special server initialization code for OS/400.

if (cimserver_initialize() != 0)

{

// do some logging here!

//l10n

//Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

//"CIM Server failed to initialize");

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

"src.Server.cimserver.SERVER_FAILED_TO_INITIALIZE",

"CIM Server failed to initialize");

return(-1);

}

#endif

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) \

|| defined(PEGASUS_OS_ZOS) || defined(PEGASUS_OS_AIX) \

|| defined(PEGASUS_OS_SOLARIS) || defined (PEGASUS_OS_VMS)

umask(S_IWGRP|S_IWOTH);

Line 896

Line 747

// try loop to bind the address, and run the server

try

{

_monitor = new Monitor();

_cimServer = new CIMServer();

_cimServer = new CIMServer(_monitor);

if (enableHttpConnection)

{

_cimServer->addAcceptor(false, portNumberHttp, false, false);

#ifdef PEGASUS_ENABLE_IPV6

_cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,

portNumberHttp, false);

#endif

#if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttp, false);

#endif

Logger::put_l(

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"src.Server.cimserver.LISTENING_ON_HTTP_PORT",

"Listening on HTTP port $0.", portNumberHttp);

"Listening on HTTP port $0.", portNumberHttp));

}

if (enableHttpsConnection)

{

_cimServer->addAcceptor(false, portNumberHttps, true, false);

#ifdef PEGASUS_ENABLE_IPV6

_cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,

portNumberHttps, true);

#endif

#if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttps, true);

#endif

Logger::put_l(

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"src.Server.cimserver.LISTENING_ON_HTTPS_PORT",

"Listening on HTTPS port $0.", portNumberHttps);

"Listening on HTTPS port $0.", portNumberHttps));

}

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

_cimServer->addAcceptor(true, 0, false, false);

_cimServer->addAcceptor(HTTPAcceptor::LOCAL_CONNECTION, 0, false);

Logger::put_l(

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"src.Server.cimserver.LISTENING_ON_LOCAL",

"Listening on local connection socket.");

"Listening on local connection socket."));

#endif

#if defined(PEGASUS_DEBUG)

Line 953

Line 823

#endif

// bind throws an exception if the bind fails

try {

_cimServer->bind();

}

catch (const BindFailedException &e)

{

#ifdef PEGASUS_DEBUG

MessageLoaderParms parms("src.Server.cimserver.BIND_FAILED",

"Could not bind: $0.", e.getMessage());

cout << MessageLoader::getMessage(parms) << endl;

#endif

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

"src.Server.cimserver.BIND.FAILED",

"Could not bind: $0", e.getMessage());

deleteCIMServer();

return 1;

}

// notify parent process (if there is a parent process) to terminate

// so user knows that there is cimserver ready to serve CIM requests.

if (daemonOption)

Line 979

Line 834

#if defined(PEGASUS_OS_HPUX) || \

defined(PEGASUS_OS_LINUX) || \

defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || \

defined(PEGASUS_OS_ZOS) || \

defined(PEGASUS_OS_AIX) || \

defined(PEGASUS_OS_SOLARIS) || \

defined(PEGASUS_OS_VMS)

Line 997

Line 852

// Put server started message to the logger

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

Logger::INFORMATION,

MessageLoaderParms(

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

_cimServerProcess->getProductName(), _cimServerProcess->getVersion());

_cimServerProcess->getProductName(),

_cimServerProcess->getVersion()));

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

Line 1018

Line 875

// Put server shutdown message to the logger

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

Logger::INFORMATION, "src.Server.cimserver.STOPPED",

Logger::INFORMATION,

"$0 stopped.", _cimServerProcess->getProductName());

MessageLoaderParms(

"src.Server.cimserver.STOPPED",

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \

"$0 stopped.", _cimServerProcess->getProductName()));

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) \

|| defined(PEGASUS_OS_SOLARIS) || defined(PEGASUS_OS_VMS)

// close the file created at startup time to indicate that the

// cimserver has terminated normally.

FileSystem::removeFile(_cimServerProcess->getPIDFileName());

#endif

}

catch(Exception& e)

{

MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",

//l10n

"cimserver not started: $0", e.getMessage());

//Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

//"Error: $0", e.getMessage());

parms);

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

cerr << MessageLoader::getMessage(parms) << endl;

"src.Server.cimserver.ERROR",

"Error: $0", e.getMessage());

#ifndef PEGASUS_OS_OS400

//l10n

//PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);

MessageLoaderParms parms("src.Server.cimserver.ERROR",

"Error: $0", e.getMessage());

PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);

#endif

// notify parent process (if there is a parent process) to terminate

Legend:

Removed from v.1.30
changed lines
	Added in v.1.41

No CVS admin address has been configured