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.142 and 1.161

version 1.142, 2005/01/03 11:00:01

version 1.161, 2005/05/05 20:24:31

Line 1

//%2004////////////////////////////////////////////////////////////////////////

//%2005////////////////////////////////////////////////////////////////////////

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

Line 6

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

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

// 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"), to

Line 45

Line 47

// Modified By: Humberto Rivero (hurivero@us.ibm.com)

// Modified By: Steve Hills (steve.hills@ncr.com)

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// Modified By: Amit K Arora, IBM (amitarora@in.ibm.com) - pep 167

// Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2555

// Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2032

// Modified By: Heather Sterling, IBM (hsterl@us.ibm.com) - PEP#222

// Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#3452

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

Line 108

Line 119

#include <fstream>

#include <Pegasus/Common/FileSystem.h>

#include <Pegasus/Common/Monitor.h>

#include <Pegasus/Server/CIMServer.h>

#include <Pegasus/Common/PegasusVersion.h>

#include <Pegasus/Common/Logger.h>

#include <Pegasus/Common/System.h>

Line 116

Line 126

#include <Pegasus/Config/ConfigManager.h>

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Server/CIMServer.h>

#include <Service/ServerProcess.h>

#if defined(PEGASUS_OS_OS400)

# include "vfyptrs.cinc"

# include "OS400ConvertChar.h"

#endif

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

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

#define PEGASUS_PROCESS_NAME "cimserver";

Uint32 parentPid = 0;

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

//enable ability to override these

#if defined(PEGASUS_OS_TYPE_WINDOWS)

#ifndef PEGASUS_SERVICE_NAME

# include "cimserver_windows.cpp"

#define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";

#elif defined(PEGASUS_OS_TYPE_UNIX)

# if defined(PEGASUS_OS_OS400)

# include "vfyptrs.cinc"

# include "OS400ConvertChar.h"

# include "cimserver_os400.cpp"

# else

# include "cimserver_unix.cpp"

#endif

#else

#ifndef PEGASUS_SERVICE_DESCRIPTION

# error "Unsupported platform"

#define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";

#endif

class CIMServerProcess : public ServerProcess

{

public:

CIMServerProcess(void)

{

cimserver_set_process(this);

}

virtual ~CIMServerProcess(void)

{

}

//defined in PegasusVersion.h

virtual const char* getProductName() const

{

return PEGASUS_PRODUCT_NAME;

}

virtual const char* getExtendedName() const

{

return PEGASUS_SERVICE_NAME;

}

virtual const char* getDescription() const

{

return PEGASUS_SERVICE_DESCRIPTION;

}

//defined in PegasusVersion.h

virtual const char* getVersion() const

{

return PEGASUS_PRODUCT_VERSION;

}

virtual const char* getProcessName() const

{

return PEGASUS_PROCESS_NAME;

}

//defined in ConfigFileDir.h

virtual const char* getPIDFileName() const

{

return CIMSERVER_START_FILE;

}

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

void cimserver_stop(void);

};

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

static CIMServer* _cimServer = 0;

// The command name.

Line 171

Line 235

ConfigManager* configManager;

/** Helper for platform specific handling. So platform specific code

can use our single instance of CIMServer.

class CimserverHolder

{

public:

CimserverHolder( CIMServer* s )

{

cimserver_set( s );

}

virtual ~CimserverHolder()

{

cimserver_set( 0 );

}

};

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

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

Line 248

Line 296

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 NT Service\n");

usage.append (" -install [name] - installs pegasus as a Windows 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 NT Service\n");

usage.append (" -remove [name] - removes pegasus as a Windows 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 NT Service\n");

usage.append (" -start [name] - starts pegasus as a Windows 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 NT Service\n");

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

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

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

#endif

Line 265

Line 313

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

cout << endl;

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

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

cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

#endif

cout << endl;

#if defined(PEGASUS_OS_TYPE_WINDOWS)

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

#elif defined(PEGASUS_OS_USE_RELEASE_DIRS)

#elif defined(PEGASUS_USE_RELEASE_DIRS)

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

#else

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

Line 282

Line 326

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

}

//This needs to be called at various points in the code depending on the 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;

}

// l10n

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

Line 329

Line 384

"Unable to connect to CIM Server. CIM Server may not be running." );

// The server job may still be active but not responding.

// Kill the job if it exists.

if(cimserver_kill() == -1)

if(_cimServerProcess->cimserver_kill(0) == -1)

cimserver_exitRC(2);

_cimServerProcess->cimserver_exitRC(2);

cimserver_exitRC(1);

_cimServerProcess->cimserver_exitRC(1);

#else

//l10n

//PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);

Line 399

Line 454

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

}

// Kill the server job.

if(cimserver_kill() == -1)

if(_cimServerProcess->cimserver_kill(0) == -1)

cimserver_exitRC(2);

_cimServerProcess->cimserver_exitRC(2);

#else

//l10n - TODO

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

Line 429

Line 484

}

// Kill the cimserver process

if (cimserver_kill() == 0)

if (_cimServerProcess->cimserver_kill(0) == 0)

{

//l10n - TODO

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

Line 439

Line 494

"Forced shutdown initiated.");

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

}

PEGASUS_STD(cerr) << "Exit! " << endl;

exit(1);

#endif

}

Line 458

Line 514

// the CIM Server is still running, kill the CIMServer process.

Uint32 maxWaitTime = timeoutValue - 2;

Boolean running = isCIMServerRunning();

Boolean running = _cimServerProcess->isCIMServerRunning();

while ( running && maxWaitTime > 0 )

{

System::sleep(1);

running = isCIMServerRunning();

running = _cimServerProcess->isCIMServerRunning();

maxWaitTime = maxWaitTime - 1;

}

if (running)

{

int kill_rc = cimserver_kill();

int kill_rc = _cimServerProcess->cimserver_kill(0);

#ifdef PEGASUS_OS_OS400

if(kill_rc == -1)

cimserver_exitRC(2);

_cimServerProcess->cimserver_exitRC(2);

cimserver_exitRC(1);

_cimServerProcess->cimserver_exitRC(1);

#endif

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

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

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) \

|| defined (PEGASUS_OS_VMS)

if (kill_rc != -1)

{

//l10n - TODO

Line 569

Line 627

#else

// windows only

setHome(pegasusHome);

//setHome(pegasusHome);

pegasusHome = _cimServerProcess->getHome();

#endif

// Get help, version, and shutdown options

Line 584

Line 643

}

else if(String::equal(arg,"--version"))

{

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

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

cout << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_VERSION << endl;

#endif

exit(0);

}

// Check for -option

Line 603

Line 658

if (*option == OPTION_VERSION &&

strlen(option) == 1)

{

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

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

cout << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_VERSION << endl;

#endif

exit(0);

}

Line 704

Line 755

// Do the plaform specific run

return platform_run( argc, argv, shutdownOption );

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

}

void CIMServerProcess::cimserver_stop()

{

_cimServer->shutdownSignal();

}

// The main, common, running code

Line 721

Line 776

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

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

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

{

String logsDirectory = String::EMPTY;

Boolean daemonOption = false;

Line 821

Line 876

#endif

// Make sure at least one connection is enabled

#ifndef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

if (!enableHttpConnection && !enableHttpsConnection)

{

//l10n

Line 859

Line 914

// We put String into Cstring because

// Directory functions only handle Cstring.

// ATTN-KS: create String based directory functions.

#if !defined(PEGASUS_USE_SYSLOGS)

// When using syslog facility. No files anymore.

logsDirectory = configManager->getCurrentValue("logdir");

logsDirectory =

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

#endif

#ifdef PEGASUS_OS_OS400

} // end if (os400StartupOption == false)

#endif

Line 872

Line 929

// ATTN: Need tool to completely disable logging.

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

!defined(PEGASUS_OS_OS400)

!defined(PEGASUS_OS_OS400) && !defined(PEGASUS_USE_SYSLOGS)

Logger::setHomeDirectory(logsDirectory);

#endif

Line 910

Line 967

// Leave this in until people get familiar with the logs.

//l10n

//cout << "Logs Directory = " << logsDirectory << endl;

#if !defined(PEGASUS_USE_SYSLOGS)

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

"Logs Directory = ");

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

#endif

}

catch (UnrecognizedConfigProperty& e)

{

Line 935

Line 994

#endif

}

Uint32 portNumberHttps;

// Bug 2148 - Here is the order of operations for determining the server HTTP and HTTPS ports.

Uint32 portNumberHttp;

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

Uint32 portNumberExportHttps;

// 2) If the user did not specify a port, get the port from the 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.

Uint32 portNumberHttps=0;

Uint32 portNumberHttp=0;

Uint32 portNumberExportHttps=0;

if (enableHttpsConnection)

{

String httpsPort = configManager->getCurrentValue("httpsPort");

CString portString = httpsPort.getCString();

if (httpsPort == String::EMPTY)

char* end = 0;

{

Uint32 port = strtol(portString, &end, 10);

assert(end != 0 && *end == '\0');

// Look up the WBEM-HTTPS port number

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

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

} else

{

// user-specified

CString portString = httpsPort.getCString();

char* end = 0;

portNumberHttps = strtol(portString, &end, 10);

if(!(end != 0 && *end == '\0'))

{

InvalidPropertyValue e("httpsPort", httpsPort);

cerr << e.getMessage() << endl;

exit(1);

}

if (enableHttpConnection)

{

String httpPort = configManager->getCurrentValue("httpPort");

CString portString = httpPort.getCString();

if (httpPort == String::EMPTY)

char* end = 0;

{

Uint32 port = strtol(portString, &end, 10);

assert(end != 0 && *end == '\0');

// Look up the WBEM-HTTP port number

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

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

} else

{

// user-specified

CString portString = httpPort.getCString();

char* end = 0;

portNumberHttp = strtol(portString, &end, 10);

if(!(end != 0 && *end == '\0'))

{

InvalidPropertyValue e("httpPort", httpPort);

cerr << e.getMessage() << endl;

exit(1);

}

if (enableSSLExportClientVerification)

{

Line 995

Line 1088

}

#if defined(PEGASUS_DEBUG)

// Put out startup up message.

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

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

//l10n

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

//cout <<"Starting..."

Line 1011

Line 1104

//l10n

// Get the parent's PID before forking

parentPid = System::getPID();

_cimServerProcess->set_parent_pid(System::getPID());

// do we need to run as a daemon ?

if (daemonOption)

{

if(-1 == cimserver_fork())

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

#ifndef PEGASUS_OS_OS400

{

return(-1);

Line 1073

Line 1166

#endif

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

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

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

|| defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || defined (PEGASUS_OS_VMS)

umask(S_IWGRP|S_IWOTH);

Line 1081

Line 1176

// if CIMServer is already running, print message and

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

if(isCIMServerRunning())

if(_cimServerProcess->isCIMServerRunning())

{

//l10n

//cout << "Unable to start CIMServer." << endl;

Line 1094

Line 1189

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

if (daemonOption)

notify_parent(1);

_cimServerProcess->notify_parent(1);

return(1);

}

Line 1105

Line 1200

try

{

Monitor monitor;

//PEP#222

//CIMServer server(&monitor);

//CimserverHolder cimserverHolder( &server );

_cimServer = new CIMServer(&monitor);

#if defined(PEGASUS_USE_23HTTPMONITOR_SERVER)

Monitor monitor(true);

CIMServer server(&monitor);

#else

monitor_2 monitor;

CIMServer server(&monitor);

#endif

CimserverHolder cimserverHolder( &server );

if (enableHttpConnection)

{

server.addAcceptor(false, portNumberHttp, false, false);

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

//l10n

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

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

Line 1132

Line 1220

}

if (enableHttpsConnection)

{

server.addAcceptor(false, portNumberHttps, true, false);

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

//l10n

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

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

Line 1142

Line 1230

}

if (enableSSLExportClientVerification)

{

server.addAcceptor(false, portNumberExportHttps, true, true);

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

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

"src.Server.cimserver.LISTENING_ON_EXPORT_HTTPS_PORT",

"Listening on Export HTTPS port $0.", portNumberExportHttps);

}

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

server.addAcceptor(true, 0, false, false);

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

//l10n

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

//"Listening on local connection socket.");

Line 1184

Line 1272

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

}

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

# ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

//l10n

//cout << "Listening on local connection socket" << endl;

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

Line 1194

Line 1282

#endif

// bind throws an exception if the bind fails

server.bind();

_cimServer->bind();

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

notify_parent(0);

_cimServerProcess->notify_parent(0);

time_t last = 0;

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_LINUX) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_LINUX) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) \

|| defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) \

|| defined(PEGASUS_OS_VMS)

// create a file to indicate that the cimserver has started and

// save the process id of the cimserver process in the file

// remove the old file if it exists

System::removeFile(CIMSERVER_START_FILE);

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

// open the file

FILE *pid_file = fopen(CIMSERVER_START_FILE, "w");

FILE *pid_file = fopen(_cimServerProcess->getPIDFileName(), "w");

if (pid_file)

{

// save the pid in the file

fprintf(pid_file, "%ld\n", (long)server_pid);

fprintf(pid_file, "%ld\n", _cimServerProcess->get_server_pid());

fclose(pid_file);

}

#endif

Line 1227

Line 1317

#endif

// Put server started message to the logger

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

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

//l10n

Logger::INFORMATION,

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

//"Started $0 version $1.",

//PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

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

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

#else

//l10n

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

//"Started $0 version $1.",

//PEGASUS_NAME, PEGASUS_VERSION);

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

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

PEGASUS_NAME, PEGASUS_VERSION);

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

#endif

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

// has been shutdown

while( !server.terminated() )

while( !_cimServer->terminated() )

{

server.runForever();

_cimServer->runForever();

}

MessageQueueService::force_shutdown(true);

// normal termination

// Put server shutdown message to the logger

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

//l10n

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

//"$0 stopped.", PLATFORM_PRODUCT_NAME);

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

"src.Server.cimserver.STOPPED",

"$0 stopped.", PLATFORM_PRODUCT_NAME);

#else

//l10n

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

//"$0 stopped.", PEGASUS_NAME);

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

"src.Server.cimserver.STOPPED",

"$0 stopped.", PEGASUS_NAME);

#endif

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

// Put server shutdown message to the logger

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

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

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

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

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

|| defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || defined(PEGASUS_OS_VMS)

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

// cimserver has terminated normally.

FileSystem::removeFile(CIMSERVER_START_FILE);

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

#endif

}

catch(Exception& e)

Line 1310

Line 1376

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

if (daemonOption)

notify_parent(1);

_cimServerProcess->notify_parent(1);

deleteCIMServer();

return 1;

}

deleteCIMServer();

return 0;

}

Legend:

Removed from v.1.142
changed lines
	Added in v.1.161

No CVS admin address has been configured