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.196 and 1.199

version 1.196, 2007/04/03 18:51:01

version 1.199, 2007/05/25 18:35:21

Line 76

// Alternatively, you can use the windows service manager. Pegasus shows up

// in the service database as "Pegasus CIM Object Manager"

// Mike Day, mdday@us.ibm.com

//////////////////////////////////////////////////////////////////////

#include <Pegasus/Common/Config.h>

#include <Pegasus/Common/Constants.h>

#include <Pegasus/Common/PegasusAssert.h>

#include <cstdlib>

#include <Pegasus/Common/FileSystem.h>

#include <Pegasus/Common/Monitor.h>

#include <Pegasus/Common/PegasusVersion.h>

Line 94

Line 91

#include <Pegasus/Common/LanguageParser.h>

#include <Pegasus/Config/ConfigManager.h>

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Server/CIMServer.h>

#include <Service/ServerProcess.h>

#include <Service/ServerShutdownClient.h>

#include <Service/ServerRunStatus.h>

#if defined(PEGASUS_OS_OS400)

# include "vfyptrs.cinc"

Line 123

Line 121

# include <fcntl.h>

#endif

#ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION

# define PEGASUS_PROCESS_NAME "cimservermain"

#else

# define PEGASUS_PROCESS_NAME "cimserver"

#endif

#include <Pegasus/Common/Executor.h>

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

#define PEGASUS_PROCESS_NAME "cimserver";

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

//enable ability to override these

#ifndef PEGASUS_SERVICE_NAME

Line 201

Line 205

void cimserver_stop(void);

};

ServerRunStatus _serverRunStatus(

PEGASUS_PROCESS_NAME, PEGASUS_CIMSERVER_START_FILE);

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

static CIMServer* _cimServer = 0;

static Monitor* _monitor = 0;

Line 238

Line 244

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

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

Some possible exceptions: NoSuchFile, FileNotReadable, CannotRenameFile,

ConfigFileSyntaxError, UnrecognizedConfigProperty, InvalidPropertyValue,

CannotOpenFile.

void GetOptions(

ConfigManager* cm,

int& argc,

char** argv,

const Boolean& shutdownOption)

Boolean shutdownOption)

{

try

{

if (shutdownOption)

{

Line 265

Line 273

// Enable updates again

cm->useConfigFiles = true;

}

catch (NoSuchFile&)

{

throw;

}

catch (FileNotReadable&)

{

throw;

}

catch (CannotRenameFile&)

{

throw;

}

catch (ConfigFileSyntaxError&)

{

throw;

}

catch(UnrecognizedConfigProperty&)

{

throw;

}

catch(InvalidPropertyValue&)

{

throw;

}

catch (CannotOpenFile&)

{

throw;

}

/* PrintHelp - This is temporary until we expand the options manager to allow

options help to be defined with the OptionRow entries and presented from

Line 384

Line 363

return((ThreadReturnType)0);

}

#ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION

// Waits until either the CIM Server has terminated, or the shutdown timeout

// has expired. If the shutdown timeout has expired, and the CIM Server is

// still running, kills the cimserver process.

void _waitForTerminationOrTimeout (Uint32 maxWaitTime)

{

// If the CIM Server is still running, and the shutdown timeout has not

// expired, loop and wait one second until either the CIM Server has

// terminated, or the shutdown timeout has expired

Boolean running = _cimServerProcess->isCIMServerRunning ();

while (running && (maxWaitTime > 0))

{

System::sleep (1);

running = _cimServerProcess->isCIMServerRunning ();

maxWaitTime--;

}

static int _extractExecutorSockOpt(int& argc, char**& argv)

// If the shutdown timeout has expired, and the CIM Server is still

// running, kill the cimserver process

if (running)

{

int kill_rc = _cimServerProcess->cimserver_kill (0);

// Extract the "--executor-socket <sock>" option if any. This indicates

// that the e[x]ecutor is running. The option argument is the socket used

// to communicate with the executor. Remove the option from the

// argv list and decrease argc by two.

#ifdef PEGASUS_OS_OS400

int sock = -1;

if (kill_rc == -1)

const char OPT[] = "--executor-socket";

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

{

_cimServerProcess->cimserver_exitRC (2);

if (strcmp(argv[i], OPT) == 0)

}

{

_cimServerProcess->cimserver_exitRC (1);

// Check for missing option argument.

#endif

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

if (i + 1 == argc)

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_SOLARIS) \

|| defined (PEGASUS_OS_VMS)

if (kill_rc != -1)

{

//l10n - TODO

MessageLoaderParms parms(

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

"src.Server.cimserver.MISSING_OPTION_ARGUMENT",

"src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",

"Missing argument for $0 option.",

"Shutdown timeout expired. Forced shutdown initiated.");

OPT);

MessageLoaderParms parms

cerr << argv[0] << ": " << MessageLoader::getMessage(parms) <<

("src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",

endl;

"Shutdown timeout expired. Forced shutdown initiated.");

exit(1);

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

exit (0);

}

#endif

}

void shutdownCIMOM(Uint32 timeoutValue)

// Convert argument to positive integer.

{

// Create CIMClient object

CIMClient client;

char* end;

// Get local host name

unsigned long x = strtoul(argv[i+1], &end, 10);

String hostStr = System::getHostName();

// Check whether option argument will fit in a signed integer.

// open connection to CIMOM

try

{

client.connectLocal();

if (*end != '\0' || x > 2147483647)

// set client timeout to 2 seconds

client.setTimeout(2000);

}

catch(Exception&)

{

#ifdef PEGASUS_OS_OS400

MessageLoaderParms parms(

//l10n

"src.Server.cimserver.BAD_OPTION_ARGUMENT",

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

"Bad $0 option argument: $1.",

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

OPT,

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

argv[i+1]);

"src.Server.cimserver.UNABLE_CONNECT_SERVER_MAY_NOT_BE_RUNNING",

cerr << argv[0] << ": " << MessageLoader::getMessage(parms) <<

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

endl;

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

// Kill the job if it exists.

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

_cimServerProcess->cimserver_exitRC(2);

_cimServerProcess->cimserver_exitRC(1);

#else

//l10n

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

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

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

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

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

exit(1);

#endif

}

try

sock = int(x);

{

// construct CIMObjectPath

String referenceStr = "//";

referenceStr.append(hostStr);

referenceStr.append("/");

referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN.getString());

referenceStr.append(":");

referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN.getString());

CIMObjectPath reference(referenceStr);

// Remove "-x <sock>" from argv-argc.

// issue the invokeMethod request on the shutdown method

Array<CIMParamValue> inParams;

Array<CIMParamValue> outParams;

// set force option to true for now

inParams.append(CIMParamValue("force",

CIMValue(Boolean(true))));

inParams.append(CIMParamValue("timeout",

CIMValue(Uint32(timeoutValue))));

CIMValue retValue = client.invokeMethod(

PEGASUS_NAMESPACENAME_SHUTDOWN,

reference,

"shutdown",

inParams,

outParams);

}

catch(CIMException& e)

{

#ifdef PEGASUS_OS_OS400

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

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

{

argc -= 2;

//l10n

break;

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

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

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

"src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY",

"Error in server shutdown: The repository may be empty.");

}

else

{

//l10n

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

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

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

"src.Server.cimserver.SHUTDOWN_FAILED",

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

}

// Kill the server job.

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

_cimServerProcess->cimserver_exitRC(2);

#else

//l10n - TODO

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

"Error in server shutdown: ");

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

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

{

// Repository may be empty.

//l10n - TODO

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

"src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY",

"Error in server shutdown: The repository may be empty.");

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

"The repository may be empty.");

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

}

else

{

//l10n - TODO

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

"src.Server.cimserver.SHUTDOWN_FAILED",

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

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

}

// Kill the cimserver process

if (sock == -1)

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

{

//l10n - TODO

MessageLoaderParms parms(

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

"src.Server.cimserver.MISSING_OPTION",

"src.Server.cimserver.SERVER_FORCED_SHUTDOWN",

"Missing $0 option.",

"Forced shutdown initiated.");

OPT);

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

cerr << argv[0] << ": " << MessageLoader::getMessage(parms) << endl;

"Forced shutdown initiated.");

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

}

exit(1);

#endif

}

catch(Exception&)

{

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

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

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

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

// timeout with a "connection timeout" exception.

// Wait until either the CIM Server has terminated, or the shutdown

// timeout has expired. If the timeout has expired and the CIM Server

// is still running, kill the cimserver process.

_waitForTerminationOrTimeout (timeoutValue - 2);

}

return sock;

// InvokeMethod succeeded.

// Wait until either the CIM Server has terminated, or the shutdown

// timeout has expired. If the timeout has expired and the CIM Server

// is still running, kill the cimserver process.

_waitForTerminationOrTimeout (timeoutValue);

return;

}

#endif /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION */

/////////////////////////////////////////////////////////////////////////

// MAIN

//////////////////////////////////////////////////////////////////////////

int main(int argc, char** argv)

{

String pegasusHome;

Line 692

Line 515

pegasusHome = _cimServerProcess->getHome();

#endif

#ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION

// If invoked with "--executor-socket <socket>" option, then use executor.

Executor::setSock(_extractExecutorSockOpt(argc, argv));

// Ping executor to verify the specified socket is valid.

if (Executor::ping() != 0)

{

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

"Failed to ping the executor on the specified socket.");

cerr << argv[0] << ": " << MessageLoader::getMessage(parms) << endl;

exit(1);

}

#endif /* !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

// Get help, version, and shutdown options

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

Line 980

Line 821

if (os400StartupOption == false)

{

#endif

// Get the log file directory definition.

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

Line 1016

Line 851

unregisterPegasusFromSLP();

#endif

shutdownCIMOM(timeoutValue);

ServerShutdownClient serverShutdownClient(&_serverRunStatus);

serverShutdownClient.shutdown(timeoutValue);

#ifdef PEGASUS_OS_OS400

//l10n

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

//"CIM Server stopped.");

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

"src.Server.cimserver.SERVER_STOPPED",

"CIM Server stopped.");

cimserver_exitRC(0);

#else

//l10n

MessageLoaderParms parms(

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

"src.Server.cimserver.SERVER_STOPPED",

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

"CIM Server stopped.");

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

Line 1037

Line 869

#endif

}

#if defined(PEGASUS_DEBUG)

#if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS)

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

Line 1004

//l10n

// Get the parent's PID before forking

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

_serverRunStatus.setParentPid(System::getPID());

// do we need to run as a daemon ?

// Do not fork when using privilege separation (executor will daemonize itself

// later).

if (daemonOption)

{

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

#ifndef PEGASUS_OS_OS400

{

return(-1);

}

#else

{

return(-1);

}

else

{

return(0);

}

#endif

}

// l10n

Line 1270

Line 1092

// if CIMServer is already running, print message and

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

if(_cimServerProcess->isCIMServerRunning())

if (_serverRunStatus.isServerRunning())

{

//l10n

MessageLoaderParms parms(

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

"src.Server.cimserver.UNABLE_TO_START_SERVER_ALREADY_RUNNING",

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

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

"Unable to start CIMServer. CIMServer is already running.");

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

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

PEGASUS_STD(endl);

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

MessageLoader::getMessage(parms));

Line 1285

Line 1106

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

if (daemonOption)

{

_cimServerProcess->notify_parent(1);

}

return(1);

return 1;

}

#endif

Line 1295

Line 1118

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

try

{

_monitor = new Monitor();

//PEP#222

//CIMServer server(&monitor);

//CimserverHolder cimserverHolder( &server );

_cimServer = new CIMServer(_monitor);

if (enableHttpConnection)

{

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

//l10n

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

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

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

Logger::put_l(

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

"src.Server.cimserver.LISTENING_ON_HTTP_PORT",

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

}

if (enableHttpsConnection)

{

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

//l10n

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

Logger::put_l(

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

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

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

"src.Server.cimserver.LISTENING_ON_HTTPS_PORT",

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

}

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

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

//l10n

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

Logger::put_l(

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

Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,

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

"src.Server.cimserver.LISTENING_ON_LOCAL",

"Listening on local connection socket.");

#endif

Line 1338

Line 1153

#if defined(PEGASUS_DEBUG)

if (enableHttpConnection)

{

//l10n

MessageLoaderParms parms(

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

"src.Server.cimserver.LISTENING_ON_HTTP_PORT",

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

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

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

}

if (enableHttpsConnection)

{

//l10n

MessageLoaderParms parms(

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

"src.Server.cimserver.LISTENING_ON_HTTPS_PORT",

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

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

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

}

# ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

//l10n

MessageLoaderParms parms(

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

"src.Server.cimserver.LISTENING_ON_LOCAL",

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

"Listening on local connection socket.");

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

# endif

#endif

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

{

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

Executor::daemonizeExecutor();

#else

_cimServerProcess->notify_parent(0);

#endif

}

time_t last = 0;

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

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

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

defined(PEGASUS_OS_SOLARIS) || defined(PEGASUS_OS_VMS)

|| defined(PEGASUS_OS_AIX) || defined(PEGASUS_OS_SOLARIS) \

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

_serverRunStatus.setServerRunning();

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

// open the file

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

if (pid_file)

{

// save the pid in the file

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

fclose(pid_file);

}

#endif

#if defined(PEGASUS_DEBUG)

Line 1417

Line 1223

Logger::INFORMATION,

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

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

_cimServerProcess->getProductName(),

_cimServerProcess->getCompleteVersion());

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

if (daemonOption && !debugOutputOption)

Line 1446

Line 1253

#endif

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

// has been shutdown

Line 1531

Line 1336

deleteCIMServer();

return 0;

}

Legend:

Removed from v.1.196
changed lines
	Added in v.1.199

No CVS admin address has been configured