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.225 and 1.240

version 1.225, 2008/11/20 20:52:34

version 1.240, 2011/12/21 12:32:07

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 98

Line 96

#include <Service/ServerRunStatus.h>

#if defined(PEGASUS_OS_ZOS)

#include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h>

#include <Pegasus/General/SetFileDescriptorToEBCDICEncoding.h>

#include <Service/ARM_zOS.h>

#include <Service/TimeZone_zOS.h>

#include <Service/WaitForTCPIP_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

Line 132

//Windows service variables are not defined elsewhere in the product

//enable ability to override these

#ifndef PEGASUS_FLAVOR

#ifndef PEGASUS_SERVICE_NAME

#define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";

#endif

#ifndef PEGASUS_SERVICE_DESCRIPTION

#define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";

#endif

#else

#ifndef PEGASUS_SERVICE_NAME

#define PEGASUS_SERVICE_NAME PEGASUS_FLAVOR " Pegasus CIM Object Manager"

#endif

#ifndef PEGASUS_SERVICE_DESCRIPTION

#define PEGASUS_SERVICE_DESCRIPTION PEGASUS_FLAVOR \

" Pegasus CIM Object Manager Service";

#endif

#ifdef PEGASUS_OS_PASE

#include <as400_protos.h> //for _SETCCSID

Line 277

Line 287

usage.append(" [ [ options ] | [ configProperty=value, ... ] ]\n");

usage.append(" options\n");

usage.append(" -v, --version - displays CIM Server version number\n");

usage.append(" --status - displays the running status of"

" the CIM Server\n");

usage.append(" -h, --help - prints this help message\n");

usage.append(" -s - shuts down CIM Server\n");

#if !defined(PEGASUS_USE_RELEASE_DIRS)

Line 341

Line 353

Thread::clearLanguages();

delete dummyInitialThread;

}

_serverRunStatus.setServerNotRunning();

}

Line 427

Line 440

#endif /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION */

static void _initConfigProperty(const String &propName, Uint32 value)

{

char strValue[22];

Uint32 n;

const char *startP = Uint32ToString(

strValue,

value,

n);

ConfigManager::getInstance()->initCurrentValue(propName, String(startP, n));

}

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

// MAIN

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

Line 453

Line 477

}

// Need to initialize timezone information in the

// initial processing thread (IPT)

tzset();

initialize_zOS_timezone();

#endif

#if defined(PEGASUS_OS_AIX) && defined(PEGASUS_HAS_MESSAGES)

Line 505

Line 529

#endif /* !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

// Get help, version, and shutdown options

// Get help, version, status and shutdown options

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

{

Line 516

Line 540

Executor::daemonizeExecutor();

exit(0);

}

if (strcmp(arg, "--status") == 0)

{

int retValue = 0;

if (_serverRunStatus.isServerRunning())

{

MessageLoaderParms parms(

"src.Server.cimserver.CIMSERVER_RUNNING",

"The CIM Server is running.");

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

}

else

{

MessageLoaderParms parms(

"src.Server.cimserver.CIMSERVER_NOT_RUNNING",

"The CIM Server is not running.");

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

retValue = 2;

}

Executor::daemonizeExecutor();

exit(retValue);

}

else if (strcmp(arg, "--version") == 0)

{

cout << _cimServerProcess->getCompleteVersion() << endl;

Line 800

Line 845

if (shutdownOption)

{

#if defined(PEGASUS_OS_ZOS) && defined(PEGASUS_ZOS_SECURITY)

// This checks whether user is authorized to stop the

// CIM Server. When unauthorized a message is logged to

// to the user and program exits.

shutdownCheckProfileCIMSERVclassWBEM();

// Depending on the success of the previous check we may not

// reach this code!!!

#endif

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

Uint32 timeoutValue =

Line 834

Line 887

return 1;

}

#if defined(PEGASUS_OS_ZOS) && defined(PEGASUS_ZOS_SECURITY)

#if defined(PEGASUS_OS_ZOS)

# if defined(PEGASUS_ZOS_SECURITY)

startupCheckBPXServer(true);

startupCheckProfileCIMSERVclassWBEM();

startupEnableMSC();

#endif

startupWaitForTCPIP();

#endif

#if defined(PEGASUS_DEBUG)

// Put out startup up message.

Line 976

Line 1032

}

else

{

MessageLoaderParms parms(

PEG_TRACE_CSTRING(TRC_SERVER,Tracer::LEVEL4,

"src.Server.cimserver.IPV6_STACK_NOT_ACTIVE",

"IPv6 stack is not active, using IPv4 socket.");

Logger::put_l(

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

parms);

#if defined(PEGASUS_DEBUG)

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

#endif

}

#endif

if (!addIP6Acceptor)

Line 1013

Line 1062

portNumberHttp = System::lookupPort(

WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);

_initConfigProperty("httpPort", portNumberHttp);

}

else

{

Line 1066

Line 1116

portNumberHttps = System::lookupPort(

WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);

_initConfigProperty("httpsPort", portNumberHttps);

}

else

{

Line 1167

Line 1218

parms);

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

deleteCIMServer();

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

if (daemonOption)

_cimServerProcess->notify_parent(1);

deleteCIMServer();

return 1;

}

Line 1197

Line 1249

#ifdef PEGASUS_ENABLE_SLP

_cimServer->startSLPProvider();

#endif

_cimServer->initComplete();

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

// has been shutdown

Legend:

Removed from v.1.225
changed lines
	Added in v.1.240

No CVS admin address has been configured