pegasus/src/WMIMapper/WMIServer/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / WMIMapper / WMIServer

Diff for /pegasus/src/WMIMapper/WMIServer/cimserver.cpp between version 1.1 and 1.2

version 1.1, 2002/11/19 21:32:49

version 1.2, 2003/08/15 22:45:40

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

// Modified By: Barbara Packard (barbara_packard@hp.com)

// (carolann_graves@hp.com)

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

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

Line 100

Line 101

#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

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

Line 207

Line 208

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

#ifndef PEGASUS_OS_HPUX

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

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

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

Line 218

Line 219

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

cout << endl;

#if defined(PEGASUS_OS_HPUX)

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

Line 259

Line 260

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

// Kill the job if it exists.

cimserver_kill();

return;

#endif

exit(0);

}

Line 270

Line 272

String referenceStr = "//";

referenceStr.append(hostStr);

referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN);

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 310

Line 313

#ifdef PEGASUS_OS_OS400

// Kill the server job.

cimserver_kill();

return;

#endif

exit(1);

}

Line 366

Line 370

{

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 401

Line 402

else

{

// Get help, version, and shutdown options

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

{

const char* arg = argv[i];

Line 417

if (*option == OPTION_VERSION)

{

#if defined(PEGASUS_OS_HPUX)

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

cout << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_VERSION << endl;

Line 432

PrintHelp(argv[0]);

exit(0);

}

#ifndef PEGASUS_OS_HPUX

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

else if (*option == OPTION_HOME)

{

if (i + 1 < argc)

Line 471

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

Line 528

exit(1);

}

// The "SSL" property overrides the enableHttp*Connection properties and

// enables only the HTTPS connection.

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, "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 578

Line 603

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

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

logsDirectory =

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

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

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

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

Logger::setHomeDirectory(logsDirectory);

#endif

Line 601

Line 625

shutdownCIMOM(timeoutValue);

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

#ifdef PEGASUS_OS_OS400

return(0);

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

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

#endif

Line 626

Line 645

{

useSLP = true;

}

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

{

useSSL = true;

}

catch (UnrecognizedConfigProperty e)

{

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

}

Uint32 portNumber;

Uint32 portNumberHttps;

Uint32 portNumberHttp;

char address[32];

if (enableHttpsConnection)

if (useSSL)

{

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.

#ifndef PEGASUS_OS_HPUX

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

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

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

Line 698

Line 715

#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.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, "CIMServer", Logger::INFORMATION,

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

}

if (enableHttpsConnection)

{

server.addAcceptor(false, portNumberHttps, true);

Logger::put(Logger::STANDARD_LOG, "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);

#elif !defined(PEGASUS_OS_HPUX)

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

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

"Listening on local connection socket.");

#endif

server.bind(portNumber);

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

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

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

Line 817

fclose(pid_file);

}

#endif

#ifndef PEGASUS_OS_HPUX

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

cout << "Started. " << endl;

#endif

// Put server started message to the logger

#ifdef PEGASUS_OS_HPUX

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

Logger::put(Logger::STANDARD_LOG, "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,

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

"Started $0 version $1.",

PEGASUS_NAME, PEGASUS_VERSION, address);

PEGASUS_NAME, PEGASUS_VERSION);

#endif

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

// has been shutdown

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 )

Line 791

Line 862

// normal termination

// Put server shutdown message to the logger

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

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

"$0 stopped.", PLATFORM_PRODUCT_NAME);

#else

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

"$0 stopped.", PEGASUS_NAME);

#endif

#if defined(PEGASUS_OS_HPUX)

Line 805

Line 881

catch(Exception& e)

{

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

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

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

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

if (daemonOption)

notify_parent();

return 1;

}

Legend:

Removed from v.1.1
changed lines
	Added in v.1.2

No CVS admin address has been configured