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.35 and 1.42

version 1.35, 2001/12/13 14:54:56

version 1.42, 2002/03/08 20:02:54

Line 30

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

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

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

Line 81

Line 83

#include <Pegasus/Common/Monitor.h>

#include <Pegasus/Server/CIMServer.h>

#include <Pegasus/Common/PegasusVersion.h>

#include <Pegasus/Protocol/Handler.h>

#include <Pegasus/Common/Logger.h>

#include <Pegasus/Common/System.h>

#include <Pegasus/Common/Tracer.h>

#include <Pegasus/Config/ConfigManager.h>

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Common/HTTPConnector.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

#ifndef PEGASUS_OS_ZOS

#include <slp/slp.h>

#endif

Line 132

Line 133

static const String NAMESPACE = "root/cimv2";

static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService";

static const String PROPERTY_TIMEOUT = "timeout";

static const String PROPERTY_TIMEOUT = "operationTimeout";

ConfigManager* configManager;

void GetEnvironmentVariables(

const char* arg0,

String& pegasusHome)

{

// Get environment variables:

const char* tmp = getenv("PEGASUS_HOME");

if (!tmp)

{

cerr << arg0 << ": PEGASUS_HOME environment variable undefined" << endl;

exit(1);

}

pegasusHome = tmp;

FileSystem::translateSlashes(pegasusHome);

}

void SetEnvironmentVariables(

const char* arg0)

{

cout << "PEGASUS_HOME is now " << arg0 << endl;

String str = "PEGASUS_HOME=";

str += arg0;

char* tmp = str.allocateCString();

putenv(tmp);

// Note: don't delete tmp! putenv() uses it.

}

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

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

Line 176

Line 146

char** argv,

const String& pegasusHome)

{

String currentFile = pegasusHome + "/" + CURRENT_CONFIG_FILE;

String plannedFile = pegasusHome + "/" + PLANNED_CONFIG_FILE;

try

{

cm->mergeConfigFiles(currentFile, plannedFile);

cm->mergeConfigFiles();

cm->mergeCommandLine(argc, argv);

}

Line 241

Line 208

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

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

usage.append (" home=/pegasus/bin - sets pegasus home directory\n");

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

cout << endl;

Line 250

Line 216

cout << usage << endl;

}

void shutdownCIMOM(Boolean forceOption, String timeoutStr)

void shutdownCIMOM(Boolean forceOption, Uint32 timeoutValue)

{

// Create CIMClient object

Monitor* monitor = new Monitor;

CIMClient client;

HTTPConnector* httpConnector = new HTTPConnector(monitor);

CIMClient client(monitor, httpConnector);

// Get the port number

Line 268

Line 232

hostStr.append(":");

hostStr.append(portNumberStr);

// Put server shutdown message to the logger

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

"Shutdown $0 on port $1.", PEGASUS_NAME, portNumberStr);

// open connection to CIMOM

Line 277

Line 245

}

catch(Exception& e)

{

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

"Failed to connect to $0 $1.", PEGASUS_NAME, e.getMessage());

PEGASUS_STD(cerr) << "Failed to connect to server: " << e.getMessage() << PEGASUS_STD(endl);

exit(1);

}

Line 297

Line 268

Array<CIMParamValue> inParams;

Array<CIMParamValue> outParams;

if (forceOption)

inParams.append(CIMParamValue("force",

{

CIMValue(Boolean(forceOption))));

inParams.append(CIMParamValue(

CIMParameter("force", CIMType::STRING),

CIMValue("TRUE")));

}

else

{

inParams.append(CIMParamValue(

CIMParameter("force", CIMType::STRING),

CIMValue("FALSE")));

}

inParams.append(CIMParamValue(

inParams.append(CIMParamValue("timeout",

CIMParameter("timeout", CIMType::STRING),

CIMValue(Uint32(timeoutValue))));

CIMValue(timeoutStr)));

CIMValue retValue = client.invokeMethod(

NAMESPACE,

Line 320

Line 280

"shutdown",

inParams,

outParams);

// Put server shutdown message to the logger

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

"$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);

}

catch(Exception& e)

{

Line 350

Line 315

String timeoutStr = String::EMPTY;

long timeoutValue = 0;

// Get environment variables:

const char* tmp = getenv("PEGASUS_HOME");

if (tmp)

{

pegasusHome = tmp;

}

FileSystem::translateSlashes(pegasusHome);

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

if (argc == 1 )

Line 391

Line 368

if (i + 1 < argc)

{

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

SetEnvironmentVariables(argv[i + 1]);

}

else

{

Line 503

Line 479

}

if (pegasusHome.size() == 0)

GetEnvironmentVariables(argv[0], pegasusHome);

// Set the value for pegasusHome property

ConfigManager::setPegasusHome(pegasusHome);

// Get an instance of the Config Manager.

Line 565

Line 543

}

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

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

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

logsDirectory =

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.

Logger::setHomeDirectory(logsDirectory);

// Check to see if we need to shutdown CIMOM

if (shutdownOption)

Line 585

Line 587

}

shutdownCIMOM(forceOption, timeoutStr);

shutdownCIMOM(forceOption, timeoutValue);

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

exit(0);

}

Line 602

Line 604

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

{

Handler::setMessageTrace(true);

pegasusIOTrace = true;

cout << "Trace Set" << endl;

}

// Check the log trace options and set global variable

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

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

{

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

Handler::setMessageLogTrace(true);

pegasusIOLog = true;

}

// Get the log file directory definition.

// We put String into Cstring because

// Directory functions only handle Cstring.

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

logsDirectory = 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.

Logger::setHomeDirectory(logsDirectory);

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

{

Logger::clean(logsDirectory);;

}

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

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

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

{

useSLP = true;

Line 698

Line 677

#endif

Monitor monitor;

CIMServer server(&monitor, pegasusHome, useSSL);

CIMServer server(&monitor, useSSL);

// bind throws an exception of the bind fails

// bind throws an exception if the bind fails

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

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

#else

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

#endif

char* end = 0;

long portNumber = strtol(address, &end, 10);

Legend:

Removed from v.1.35
changed lines
	Added in v.1.42

No CVS admin address has been configured