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.223 and 1.228

version 1.223, 2008/10/17 11:07:42

version 1.228, 2008/12/16 18:58:05

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 717

Line 715

MessageLoader::setPegasusMsgHome(ConfigManager::getHomedPath(

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

#if !defined(PEGASUS_USE_SYSLOGS)

String logsDirectory = ConfigManager::getHomedPath(

configManager->getCurrentValue("logdir"));

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

// Might be more logical to clean before set.

Logger::setHomeDirectory(logsDirectory);

#endif

#ifdef PEGASUS_OS_PASE

/* write job log to tell where pegasus log is.*/

if(logsDirectory.size() > 0)

// this function only can be found in PASE environment

logPegasusDir2joblog(logsDirectory.getCString());

else

logPegasusDir2joblog(".");

// set ccsid to unicode for entire job

// ccsid is globolization mechanism in PASE environment

if (_SETCCSID(1208) == -1)

Line 733

Line 748

char fullJobName[29];

umeGetJobName(fullJobName, true);

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

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

Logger::INFORMATION,

MessageLoaderParms(

"src.Server.cimserver.SERVER_JOB_NAME.PEGASUS_OS_PASE",

"CIM Server's Job Name is: $0", fullJobName));

Line 777

Line 793

daemonOption = true;

}

#if !defined(PEGASUS_USE_SYSLOGS)

String logsDirectory = ConfigManager::getHomedPath(

configManager->getCurrentValue("logdir"));

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

// Might be more logical to clean before set.

Logger::setHomeDirectory(logsDirectory);

# ifdef PEGASUS_OS_PASE

/* write job log to tell where pegasus log is.*/

if(logsDirectory.size() > 0)

// this function only can be found in PASE environment

logPegasusDir2joblog(logsDirectory.getCString());

else

logPegasusDir2joblog(".");

# endif

#endif

// Check to see if we need to shutdown CIMOM

Line 1038

Line 1036

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttp, false);

}

// The port number is converted to a string to avoid the

// addition of localized characters (e.g., "5,988").

char scratchBuffer[22];

Uint32 n;

const char * portNumberHttpStr = Uint32ToString(

Line 1089

Line 1088

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttps, true);

}

// The port number is converted to a string to avoid the

// addition of localized characters (e.g., "5,989").

char scratchBuffer[22];

Uint32 n;

const char * portNumberHttpsStr = Uint32ToString(

Legend:

Removed from v.1.223
changed lines
	Added in v.1.228

No CVS admin address has been configured