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.57 and 1.88

version 1.57, 2002/06/01 00:25:05

version 1.88, 2003/03/27 17:27:26

Line 1

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

// The Open Group, Tivoli Systems

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

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

Line 31

Line 32

// Modified By: Jenny Yu (jenny_yu@hp.com)

// Modified By: Sushma Fernandes (sushma_fernandes@hp.com)

// Carol Ann Krug Graves, Hewlett-Packard Company

// (carolann_graves@hp.com)

// Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)

// Modified By: Dave Rosckes (rosckes@us.ibm.com)

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

Line 39

Line 45

// Notes on deamon operation (Unix) and service operation (Win 32):

// To run pegasus as a daemon on Unix platforms, use the -d option:

// To run pegasus as a daemon on Unix platforms:

// cimserver

// cimserver -d

// To NOT run pegasus as a daemon on Unix platforms, set the daemon config

// property to false:

// The -d option has no effect on windows operation.

// cimserver daemon=false

// The daemon config property has no effect on windows operation.

// To shutdown pegasus, use the -s option:

// cimserver -s [-t timeout_value]

// cimserver -s

// To run pegasus as an NT service, there are FOUR different possibilities:

Line 76

Line 87

#include <Pegasus/Common/Config.h>

#include <Pegasus/suballoc/suballoc.h>

#include <Pegasus/Common/Constants.h>

#include <iostream>

#include <cassert>

#include <cstdlib>

Line 92

Line 103

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

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

#if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)

#include <slp/slp.h>

#endif

Line 100

Line 111

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

# if defined(PEGASUS_OS_OS400)

# include "cimserver_os400.cpp"

# else

# include "cimserver_unix.cpp"

#endif

#else

# error "Unsupported platform"

#endif

Line 129

Line 144

static const char OPTION_SHUTDOWN = 's';

static const char OPTION_FORCE = 'f';

static const char OPTION_INSTALL[] = "install";

static const char OPTION_REMOVE[] = "remove";

static const char OPTION_START[] = "start";

static const char OPTION_TIMEOUT = 't';

static const char OPTION_STOP[] = "stop";

#if defined(PEGASUS_OS_HPUX)

static const char OPTION_BINDVERBOSE = 'X';

#endif

static const String NAMESPACE = "root/PG_Internal";

static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService";

static const String PROPERTY_TIMEOUT = "shutdownTimeout";

static const String CIMSERVERSTART_FILE = "/etc/wbem/cimserver_start.conf";

static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";

ConfigManager* configManager;

Line 198

Line 215

usage.append (COMMAND_NAME);

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

usage.append (" options\n");

usage.append (" -v - displays pegasus version number\n");

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

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

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

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

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

usage.append (" -d - runs pegasus as a daemon\n");

#endif

usage.append (" -s [-t timeout] \n");

#if defined(PEGASUS_OS_TYPE_WINDOWS)

usage.append (" - shuts down pegasus\n");

#if !defined(PEGASUS_OS_HPUX)

usage.append (" -cleanlogs - clears the log files at startup\n");

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

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

usage.append (" -slp - registers pegasus as a service with SLP\n\n");

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

usage.append (" -SSL - uses SSL\n\n");

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

#endif

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

usage.append (" port=nnnn - sets port number to listen on\n");

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

usage.append (" logdir=/pegasus/logs - directory for log files\n");

cout << endl;

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

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

#else

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

#endif

cout << endl;

cout << usage << endl;

}

Line 241

Line 260

client.connectLocal();

// set client timeout to 2 seconds more than the shutdown timeout

// set client timeout to 2 seconds

// so that the command client does not timeout before the cimserver

// terminates

Uint32 clientTimeout;

client.setTimeout(2000);

if (timeoutValue == 0)

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

ArrayDestroyer<char> timeoutCString(configTimeout.allocateCString());

clientTimeout =

((strtol(timeoutCString.getPointer(), (char **)0,10))+2)*1000;

}

else

catch(Exception& e)

{

clientTimeout = (timeoutValue + 2)*1000;

}

client.setTimeOut(clientTimeout);

}

catch(CIMClientException& e)

{

#ifdef PEGASUS_OS_OS400

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

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

cimserver_kill();

exit(1);

#else

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

PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);

#endif

exit(0);

}

Line 275

Line 287

String referenceStr = "//";

referenceStr.append(hostStr);

referenceStr.append(PEGASUS_NAMESPACENAME_CIMV2);

referenceStr.append("/");

referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN.getString());

referenceStr.append(":");

referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN);

referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN.getString());

CIMObjectPath reference(referenceStr);

Line 294

Line 307

CIMValue(Uint32(timeoutValue))));

CIMValue retValue = client.invokeMethod(

NAMESPACE,

PEGASUS_NAMESPACENAME_SHUTDOWN,

reference,

"shutdown",

inParams,

outParams);

}

catch(CIMClientCIMException& e)

catch(CIMException& e)

{

#ifdef PEGASUS_OS_OS400

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

{

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

"Failed to shutdown server: $0", "The repository may be empty.");

}

else

{

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

"Failed to shutdown server: $0", e.getMessage());

}

// Kill the server job.

cimserver_kill();

#else

PEGASUS_STD(cerr) << "Failed to shutdown server: ";

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

{

PEGASUS_STD(cerr) << "The repository may be empty.";

PEGASUS_STD(cerr) << PEGASUS_STD(endl);

}

else

{

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

}

#endif

exit(1);

}

catch(CIMClientException& e)

catch(Exception& e)

{

// This may mean the CIM Server has been terminated and returns a

Line 316

Line 354

// give CIM Server some time to finish up

//System::sleep(1);

//cimserver_kill();

// Check to see if CIMServer is still running. If CIMServer

// is still running and the shutdown timeout has not expired,

// loop and wait one second until either CIM Server is

// terminated or until timeout expires. If timeout expires

// and CIMServer is still running, kill the CIMServer

// process.

Uint32 maxWaitTime = timeoutValue - 2;

Boolean running = isCIMServerRunning();

while ( running && maxWaitTime > 0 )

{

System::sleep(1);

cimserver_kill();

running = isCIMServerRunning();

maxWaitTime = maxWaitTime - 1;

}

catch(Exception& e)

if (running)

{

PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";

cimserver_kill();

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

exit(1);

}

//catch(Exception& e)

//{

// PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";

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

// exit(1);

//}

return;

}

Line 336

Line 396

int main(int argc, char** argv)

{

String pegasusHome = String::EMPTY;

Boolean pegasusIOLog = false;

String httpPort = String::EMPTY;

String httpsPort = String::EMPTY;

String logsDirectory = String::EMPTY;

Boolean useSLP = false;

Boolean useSSL = false;

Boolean daemonOption = false;

Boolean shutdownOption = false;

Boolean timeoutOption = false;

Uint32 timeoutValue = 0;

String timeoutStr = String::EMPTY;

long timeoutValue = 0;

#ifdef PEGASUS_OS_OS400

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

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

// Get environment variables:

Line 359

Line 419

}

FileSystem::translateSlashes(pegasusHome);

#else

// windows only

setHome(pegasusHome);

#endif

// on Windows NT if there are no command-line options, run as a service

if (argc == 1 )

Line 368

Line 432

}

else

{

// Get help, version and home options

// Get help, version, and shutdown options

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

{

Line 383

Line 447

// Check to see if user asked for the version (-v option):

if (*option == OPTION_VERSION)

if (*option == OPTION_VERSION &&

strlen(option) == 1)

{

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

cout << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_VERSION << endl;

#endif

exit(0);

}

// Check to see if user asked for help (-h option):

else if (*option == OPTION_HELP)

else if (*option == OPTION_HELP &&

(strlen(option) == 1))

{

PrintHelp(argv[0]);

exit(0);

}

else if (*option == OPTION_HOME)

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

else if (*option == OPTION_HOME &&

(strlen(option) == 1))

{

if (i + 1 < argc)

{

Line 411

Line 483

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

argc -= 2;

}

#endif

#if defined(PEGASUS_OS_HPUX)

// Check to see if user asked for the version (-X option):

if (*option == OPTION_BINDVERBOSE)

if (*option == OPTION_BINDVERBOSE &&

(strlen(option) == 1))

{

System::bindVerbose = true;

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

Line 428

Line 502

// Check to see if user asked for shutdown (-s option):

else if (*option == OPTION_SHUTDOWN)

else if (*option == OPTION_SHUTDOWN &&

(strlen(option) == 1))

{

// check to see if user is root

#ifndef PEGASUS_OS_OS400

if (!System::isPrivilegedUser(System::getEffectiveUserName()))

{

cout << "You must have superuser privilege to run ";

cout << "cimserver." << endl;

exit(0);

}

#endif

// Check to see if shutdown has already been specified:

Line 456

Line 532

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

argc--;

}

else if (*option == OPTION_TIMEOUT)

#ifdef PEGASUS_OS_TYPE_WINDOWS

else if (strcmp(option, OPTION_INSTALL) == 0)

{

// Check to see if shutdown has been specified:

// Install as a NT service

if (!shutdownOption)

if(cimserver_install_nt_service())

{

cout << "Invalid option -" << option << endl;

cout << "\nPegasus installed as NT Service";

exit(0);

}

else

if (timeoutOption)

{

cout << "Duplicate timeout option specified." << endl;

exit(0);

}

timeoutOption = true;

else if (strcmp(option, OPTION_REMOVE) == 0)

if (i + 1 < argc)

{

// get timeout value

timeoutStr.assign(argv[i + 1]);

// Remove Pegasus as an NT service

// validate timeout value string

if(cimserver_remove_nt_service())

char* tmp = timeoutStr.allocateCString();

{

char* end = 0;

cout << "\nPegasus removed as NT Service";

timeoutValue = strtol(tmp, &end, 10);

exit(0);

}

else

{

exit(0);

}

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

}

else if (strcmp(option, OPTION_START) == 0)

{

// Start as a NT service

if(cimserver_start_nt_service())

{

cout << "invalid timeout value specified: ";

cout << "\nPegasus started as NT Service";

cout << timeoutStr << endl;

delete [] tmp;

exit(0);

}

else

{

exit(0);

}

else if (strcmp(option, OPTION_STOP) == 0)

{

// Stop as a NT service

if(cimserver_stop_nt_service())

{

cout << "\nPegasus stopped as NT Service";

exit(0);

}

else

{

cout << "Missing argument for option -";

cout << option << endl;

exit(0);

}

// remove the option from the command line

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

argc -= 2;

}

#endif

else

i++;

}

Line 533

Line 624

}

catch (Exception& e)

{

#ifdef PEGASUS_OS_OS400

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

"$0: $1",argv[0] ,e.getMessage());

#else

cerr << argv[0] << ": " << e.getMessage() << endl;

#endif

exit(1);

}

Boolean enableHttpConnection = String::equal(

try

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

{

Boolean enableHttpsConnection = String::equal(

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

// Check to see if we should (can) install as a NT service

// Make sure at least one connection is enabled

#ifndef PEGASUS_LOCAL_DOMAIN_SOCKET

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

if (!enableHttpConnection && !enableHttpsConnection)

{

if( 0 != cimserver_install_nt_service( pegasusHome ))

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

{

"Neither HTTP nor HTTPS connection is enabled. "

cout << "\nPegasus installed as NT Service";

"CIMServer will not be started.");

exit(0);

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

}

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

exit(1);

}

#endif

try

// Check to see if we should (can) remove Pegasus as an NT service

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

{

if( 0 != cimserver_remove_nt_service() )

{

cout << "\nPegasus removed as NT Service";

exit(0);

}

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

Line 575

Line 662

daemonOption = true;

}

// Check the log trace options and set global variable

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

{

pegasusIOLog = true;

}

// Get the log file directory definition.

// We put String into Cstring because

// Directory functions only handle Cstring.

Line 597

Line 675

// Might be more logical to clean before set.

// ATTN: Need tool to completely disable logging.

#ifndef PEGASUS_OS_HPUX

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

!defined(PEGASUS_OS_OS400)

Logger::setHomeDirectory(logsDirectory);

#endif

Line 606

Line 685

if (shutdownOption)

{

String configTimeout =

// if timeout was specified, validate the timeout value

configManager->getCurrentValue("shutdownTimeout");

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

if (timeoutOption)

{

Boolean valid = configManager->validatePropertyValue(

PROPERTY_TIMEOUT,

timeoutStr);

if (!valid)

{

cout << "Invalid timeout value specified: " << timeoutValue;

cout << endl;

exit(1);

}

shutdownCIMOM(timeoutValue);

cout << "Pegasus CIM Server stopped." << endl;

#ifdef PEGASUS_OS_OS400

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

"CIM Server stopped.");

#else

cout << "CIM Server stopped." << endl;

#endif

exit(0);

}

// Get the port numbers

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

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

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

#ifndef PEGASUS_OS_HPUX

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

!defined(PEGASUS_OS_OS400)

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

#endif

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

{

Logger::clean(logsDirectory);;

}

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

{

useSLP = true;

}

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

{

useSSL = true;

}

catch (UnrecognizedConfigProperty e)

{

#ifdef PEGASUS_OS_OS400

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

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

#else

cout << "Error: " << e.getMessage() << endl;

#endif

}

Uint32 portNumber;

Uint32 portNumberHttps;

Uint32 portNumberHttp;

char address[32];

if (useSSL)

if (enableHttpsConnection)

{

char* p = httpsPort.allocateCString();

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

CString portString = httpsPort.getCString();

char* end = 0;

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

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

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

delete [] p;

// Look up the WBEM-HTTPS port number

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

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

sprintf(address, "%u", portNumber);

}

else

if (enableHttpConnection)

{

char* p = httpPort.allocateCString();

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

CString portString = httpPort.getCString();

char* end = 0;

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

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

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

delete [] p;

// Look up the WBEM-HTTP port number

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

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

sprintf(address, "%u", portNumber);

}

// Put out startup up message.

cout << PEGASUS_NAME << PEGASUS_VERSION <<

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

" on port " << address << endl;

!defined(PEGASUS_OS_OS400)

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

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

cout <<"Starting..."

<< (pegasusIOLog ? " Tracing to Log ": " ")

<< (useSLP ? " SLP reg. " : " No SLP ")

<< (useSSL ? " Use SSL " : " No SSL ")

<< endl;

#endif

// do we need to run as a daemon ?

if (daemonOption)

{

if(-1 == cimserver_fork())

#ifndef PEGASUS_OS_OS400

{

exit(-1);

}

#else

{

return(-1);

}

else

{

return(0);

}

#endif

}

#ifdef PEGASUS_OS_OS400

// Special server initialization code for OS/400.

if (cimserver_initialize() != 0)

{

// do some logging here!

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

"CIM Server failed to initialize");

exit(-1);

}

#endif

#ifdef PEGASUS_OS_HPUX

umask(S_IWGRP|S_IWOTH);

// check if CIMServer is already running

// if CIMServer is already running, print message and

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

if(isCIMServerRunning())

{

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

cout << "CIMServer is already running." << endl;

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

if (daemonOption)

notify_parent();

exit(1);

}

#endif

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

try

{

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

#if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)

char slp_address[32];

slp_client *discovery = new slp_client() ;;

String serviceURL;

serviceURL.assign("service:cim.pegasus://");

String host_name = slp_get_host_name();

serviceURL += host_name;

serviceURL.append(host_name);

serviceURL += ":";

serviceURL.append(":");

serviceURL += address;

// ATTN: Fix this to work for multiple connections

char *url = serviceURL.allocateCString();

sprintf(slp_address, "%u",

// free(host_name);

enableHttpConnection ? portNumberHttp : portNumberHttps);

serviceURL.append(slp_address);

#endif

Monitor monitor;

Monitor monitor(true);

CIMServer server(&monitor, useSSL);

CIMServer server(&monitor);

// bind throws an exception if the bind fails

if (enableHttpConnection)

{

server.addAcceptor(false, portNumberHttp, false);

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

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

}

if (enableHttpsConnection)

{

server.addAcceptor(false, portNumberHttps, true);

Logger::put(Logger::STANDARD_LOG, Sysmte::CIMSERVER, Logger::INFORMATION,

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

}

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

cout << "Binding to domain socket" << endl;

server.addAcceptor(true, 0, false);

#else

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

cout << "Binding to " << address << endl;

"Listening on local connection socket.");

#endif

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

if (enableHttpConnection)

{

cout << "Listening on HTTP port " << portNumberHttp << endl;

}

if (enableHttpsConnection)

{

cout << "Listening on HTTPS port " << portNumberHttps << endl;

}

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

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

# endif

#endif

server.bind(portNumber);

// bind throws an exception if the bind fails

server.bind();

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

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

if (daemonOption)

notify_parent();

time_t last = 0;

Line 758

Line 898

fclose(pid_file);

}

#endif

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

!defined(PEGASUS_OS_OS400)

cout << "Started. " << endl;

#endif

// Put server started message to the logger

Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,

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

"Started $0 version $1 on port $2.",

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

PEGASUS_NAME, PEGASUS_VERSION, address);

"Started $0 version $1.",

PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

#else

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

"Started $0 version $1.",

PEGASUS_NAME, PEGASUS_VERSION);

#endif

Line 772

Line 921

while( !server.terminated() )

{

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

#if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)

if(useSLP )

{

if( (time(NULL) - last ) > 60 )

{

if( discovery != NULL && url != NULL )

if( discovery != NULL && serviceURL.size() )

discovery->srv_reg_all(url,

discovery->srv_reg_all(serviceURL.getCString(),

"(namespace=root/cimv2)",

"service:cim.pegasus",

"DEFAULT",

Line 796

Line 945

// normal termination

// Put server shutdown message to the logger

Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,

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

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

"$0 stopped.", PLATFORM_PRODUCT_NAME);

#else

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

"$0 stopped.", PEGASUS_NAME);

#endif

#if defined(PEGASUS_OS_HPUX)

Line 809

Line 963

}

catch(Exception& e)

{

Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,

#ifdef PEGASUS_OS_OS400

"$0 .Abnormal Termination.", e.getMessage());

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

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

#else

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

#endif

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

if (daemonOption)

notify_parent();

return 1;

}

Legend:

Removed from v.1.57
changed lines
	Added in v.1.88

No CVS admin address has been configured