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.85 and 1.93

version 1.85, 2003/03/04 17:55:48

version 1.93, 2003/05/27 21:37:03

Line 38

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

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

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

Line 157

Line 159

#endif

static const String PROPERTY_TIMEOUT = "shutdownTimeout";

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

ConfigManager* configManager;

Line 222

Line 223

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

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

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

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

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

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

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

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

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

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

Line 240

Line 249

cout << usage << endl;

}

// cimserver_exit: platform specific exit routine calls

void cimserver_exit( int rc ){

#ifdef PEGASUS_OS_OS400

cimserver_exitRC(rc);

#endif

exit(rc);

}

void shutdownCIMOM(Uint32 timeoutValue)

{

Line 267

Line 286

catch(Exception& e)

{

#ifdef PEGASUS_OS_OS400

Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,

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();

if(cimserver_kill() == -1)

exit(1);

cimserver_exit(2);

cimserver_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);

cimserver_exit(0);

}

try

Line 319

Line 339

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

{

Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,

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, "", Logger::SEVERE,

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

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

}

// Kill the server job.

cimserver_kill();

if(cimserver_kill() == -1)

cimserver_exit(2);

#else

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

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

Line 341

Line 362

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

}

#endif

exit(1);

cimserver_exit(1);

}

catch(Exception& e)

{

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

// This may mean that the CIM Server has terminated, causing this

// "Empty HTTP response message" HTTP error response. To be sure

// client to get a "Empty HTTP response message" exception. It may

// CIM Server gets shutdown, if CIM Server is still running at

// also mean that the CIM Server is taking longer than 2 seconds

// this time, we will kill the cimserver process.

// (client timeout value) to terminate, causing this client to

// timeout with a "connection timeout" exception.

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

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

// terminated or until timeout expires. If timeout expires

// terminated or timeout expires. If timeout expires and

// and CIMServer is still running, kill the CIMServer

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

// process.

Uint32 maxWaitTime = timeoutValue - 2;

Boolean running = isCIMServerRunning();

Line 376

Line 391

if (running)

{

cimserver_kill();

int kill_rc = cimserver_kill();

#ifdef PEGASUS_OS_OS400

if(kill_rc == -1)

cimserver_exit(2);

cimserver_exit(1);

#endif

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

if (kill_rc != -1)

{

cout << "Shutdown timeout expired. CIM Server process killed." << endl;

exit(0);

}

#endif

}

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

Line 418

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;

Uint32 timeoutValue = 0;

Line 542

Line 560

// Install as a NT service

if(cimserver_install_nt_service())

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_install_nt_service(opt_arg))

{

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

exit(0);

Line 557

Line 581

// Remove Pegasus as an NT service

if(cimserver_remove_nt_service())

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_remove_nt_service(opt_arg))

{

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

exit(0);

Line 573

Line 602

// Start as a NT service

if(cimserver_start_nt_service())

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_start_nt_service(opt_arg))

{

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

exit(0);

Line 588

Line 622

// Stop as a NT service

if(cimserver_stop_nt_service())

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_stop_nt_service(opt_arg))

{

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

exit(0);

Line 629

Line 668

catch (Exception& e)

{

#ifdef PEGASUS_OS_OS400

Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,

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

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

#else

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

Line 637

Line 676

exit(1);

}

Boolean enableHttpConnection = String::equal(

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

Boolean enableHttpsConnection = String::equal(

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

// Make sure at least one connection is enabled

#ifndef PEGASUS_LOCAL_DOMAIN_SOCKET

if (!enableHttpConnection && !enableHttpsConnection)

{

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

"Neither HTTP nor HTTPS connection is enabled. "

"CIMServer will not be started.");

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

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

exit(1);

}

#endif

try

{

Line 648

Line 705

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 687

Line 735

shutdownCIMOM(timeoutValue);

#ifdef PEGASUS_OS_OS400

Logger::put(Logger::ERROR_LOG, "", Logger::INFORMATION,

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

"CIM Server stopped.");

#else

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

#endif

exit(0);

cimserver_exit(0);

}

// Get the port numbers

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

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

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

#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 defined(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)

Boolean enableHttpConnection = String::equal(

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

Boolean enableHttpsConnection = String::equal(

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

if (enableHttpConnection && enableHttpsConnection)

{

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

"Enabling both HTTP and HTTPS connections is unsupported. "

"Only the HTTPS connection is enabled.");

cerr << "Enabling both HTTP and HTTPS connections is unsupported. "

"Only the HTTPS connection is enabled." << endl;

}

else if (!enableHttpConnection && !enableHttpsConnection)

{

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

"Neither HTTP nor HTTPS connection is enabled. "

"CIMServer will not be started.");

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

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

exit(1);

}

useSSL = enableHttpsConnection;

#else

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

{

useSSL = true;

}

#endif

}

catch (UnrecognizedConfigProperty e)

{

#ifdef PEGASUS_OS_OS400

Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,

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* end = 0;

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

CString portString = httpsPort.getCString();

char* end = 0;

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

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

// 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* end = 0;

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

CString portString = httpPort.getCString();

char* end = 0;

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

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

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

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

!defined(PEGASUS_OS_OS400)

cout << PEGASUS_NAME << PEGASUS_VERSION <<

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

" on port " << address << endl;

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

cout <<"Starting..."

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

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

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

<< endl;

#endif

Line 832

Line 831

if (cimserver_initialize() != 0)

{

// do some logging here!

Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,

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

"CIM Server failed to initialize");

exit(-1);

}

#endif

#ifdef PEGASUS_OS_HPUX

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

umask(S_IWGRP|S_IWOTH);

Line 866

Line 865

try

{

#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.append(host_name);

serviceURL.append(":");

serviceURL.append(address);

// ATTN: Fix this to work for multiple connections

sprintf(slp_address, "%u",

enableHttpConnection ? portNumberHttp : portNumberHttps);

serviceURL.append(slp_address);

#endif

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, System::CIMSERVER, Logger::INFORMATION,

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

}

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifdef PEGASUS_OS_OS400

server.addAcceptor(true, 0, false);

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

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

"Binding to domain socket");

"Listening on local connection socket.");

#else

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

#endif

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

#ifdef PEGASUS_OS_OS400

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

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

if (enableHttpConnection)

"Binding to domain socket");

{

#else

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

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

}

if (enableHttpsConnection)

{

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

}

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

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

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

Line 904

Line 923

time_t last = 0;

#if defined(PEGASUS_OS_HPUX)

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

// 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(fname);

System::removeFile(CIMSERVER_START_FILE);

// open the file

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

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

if (pid_file)

{

// save the pid in the file

Line 922

Line 941

fclose(pid_file);

}

#endif

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

!defined(PEGASUS_OS_OS400)

cout << "Started. " << endl;

Line 929

Line 949

// Put server started message to the logger

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

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

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

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

"Started $0 version $1.",

PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION, address);

PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

#else

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

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

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

"Started $0 version $1.",

PEGASUS_NAME, PEGASUS_VERSION, address);

PEGASUS_NAME, PEGASUS_VERSION);

#endif

Line 969

Line 989

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

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

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

// cimserver has terminated normally.

FileSystem::removeFile(CIMSERVERSTART_FILE);

FileSystem::removeFile(CIMSERVER_START_FILE);

#endif

}

catch(Exception& e)

{

#ifdef PEGASUS_OS_OS400

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

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

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

#else

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

Legend:

Removed from v.1.85
changed lines
	Added in v.1.93

No CVS admin address has been configured