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.102 and 1.167

version 1.102, 2003/08/17 23:37:03

version 1.167, 2005/06/03 17:26:21

Line 1

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

//%2005////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

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

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

Line 24

Line 30

// Author: Mike Brasher (mbrasher@bmc.com)

// Modified By: Mike Day (mdday@us.ibm.com)

// Karl Schopmeyer (k.schopmeyer@opengroup.org)

// Modified By: Karl Schopmeyer (k.schopmeyer@opengroup.org)

// Nag Boranna (nagaraja_boranna@hp.com)

// Jenny Yu (jenny_yu@hp.com)

// Modified By: Nag Boranna (nagaraja_boranna@hp.com)

// Sushma Fernandes (sushma_fernandes@hp.com)

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

// Dave Rosckes (rosckes@us.ibm.com)

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

// Humberto Rivero (hurivero@us.ibm.com)

// Steve Hills (steve.hills@ncr.com)

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

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// Amit K Arora, IBM (amitarora@in.ibm.com) - pep 167

// Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2555

// Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2032

// Heather Sterling, IBM (hsterl@us.ibm.com) - PEP#222

// Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#3452

// David Dillard, VERITAS Software Corp.

// (david.dillard@veritas.com)

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

Line 75

Line 84

// To START the Pegasus service,

// net start cimserver

// or

// cimserver -start

// To STOP the Pegasus service,

// net stop cimserver

// or

// cimserver -stop

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

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

Line 90

Line 103

#include <Pegasus/Common/Config.h>

#include <Pegasus/Common/Constants.h>

#include <iostream>

#include <cassert>

#include <cstdlib>

#include <fstream>

#include <Pegasus/Common/FileSystem.h>

#include <Pegasus/Common/Monitor.h>

#include <Pegasus/Server/CIMServer.h>

#include <Pegasus/Common/PegasusVersion.h>

#include <Pegasus/Common/Logger.h>

#include <Pegasus/Common/System.h>

Line 104

Line 114

#include <Pegasus/Config/ConfigManager.h>

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

#include <Pegasus/Server/CIMServer.h>

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

#include <Service/ServerProcess.h>

#include <slp/slp.h>

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

# if defined(PEGASUS_OS_OS400)

# include "vfyptrs.cinc"

# include "OS400ConvertChar.h"

# include "cimserver_os400.cpp"

# else

# include "cimserver_unix.cpp"

#endif

#else

# error "Unsupported platform"

#endif

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

#define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";

#endif

#ifndef PEGASUS_SERVICE_DESCRIPTION

#define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";

#endif

class CIMServerProcess : public ServerProcess

{

public:

CIMServerProcess(void)

{

cimserver_set_process(this);

}

virtual ~CIMServerProcess(void)

{

}

//defined in PegasusVersion.h

virtual const char* getProductName() const

{

return PEGASUS_PRODUCT_NAME;

}

virtual const char* getExtendedName() const

{

return PEGASUS_SERVICE_NAME;

}

virtual const char* getDescription() const

{

return PEGASUS_SERVICE_DESCRIPTION;

}

//defined in PegasusVersion.h

virtual const char* getVersion() const

{

return PEGASUS_PRODUCT_VERSION;

}

virtual const char* getProcessName() const

{

return PEGASUS_PROCESS_NAME;

}

//defined in ConfigFileDir.h

virtual const char* getPIDFileName() const

{

return CIMSERVER_START_FILE;

}

int cimserver_run(int argc, char** argv, bool shutdownOption);

void cimserver_stop(void);

};

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

static CIMServer* _cimServer = 0;

static Monitor* _monitor = 0;

static Thread* dummyInitialThread = 0;

// The command name.

Line 147

Line 212

static const char OPTION_SHUTDOWN = 's';

static const char OPTION_INSTALL[] = "install";

static const char LONG_HELP [] = "help";

static const char OPTION_REMOVE[] = "remove";

static const char LONG_VERSION [] = "version";

static const char OPTION_START[] = "start";

static const char OPTION_STOP[] = "stop";

#if defined(PEGASUS_OS_HPUX)

static const char OPTION_BINDVERBOSE = 'X';

Line 169

Line 230

void GetOptions(

ConfigManager* cm,

int& argc,

char** argv,

char** argv)

const String& pegasusHome)

{

try

{

Line 178

Line 238

cm->mergeCommandLine(argc, argv);

}

catch (NoSuchFile nsf)

catch (NoSuchFile&)

{

throw;

}

catch (FileNotReadable&)

{

throw nsf;

throw;

}

catch (FileNotReadable fnr)

catch (CannotRenameFile&)

{

throw fnr;

throw;

}

catch (CannotRenameFile ftrf)

catch (ConfigFileSyntaxError&)

{

throw ftrf;

throw;

}

catch (ConfigFileSyntaxError cfse)

catch(UnrecognizedConfigProperty&)

{

throw cfse;

throw;

}

catch(UnrecognizedConfigProperty ucp)

catch(InvalidPropertyValue&)

{

throw ucp;

throw;

}

catch(InvalidPropertyValue ipv)

catch (CannotOpenFile&)

{

throw ipv;

throw;

}

Line 210

Line 274

void PrintHelp(const char* arg0)

{

/**

Build the usage string for the config command.

/* l10n

String usage = String (USAGE);

usage.append (COMMAND_NAME);

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

usage.append (" options\n");

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

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

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

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

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

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

#if !defined(PEGASUS_USE_RELEASE_DIRS)

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

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

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

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

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

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

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

usage.append (" -remove [name] - removes pegasus as a Windows 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 (" -start [name] - starts pegasus as a Windows 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 (" -stop [name] - stops pegasus as a Windows Service\n");

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

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

#endif

Line 242

Line 302

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

cout << endl;

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

cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;

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

#else

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

#endif

cout << endl;

cout << usage << endl;

String usage = String (USAGE);

usage.append (COMMAND_NAME);

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

usage.append (" options\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("$0");

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

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

MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS", usage);

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

#elif defined(PEGASUS_USE_RELEASE_DIRS)

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

MessageLoaderParms parms("src.Server.cimserver.MENU.HPUXLINUXIA64GNU", usage);

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

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;

#if defined(PEGASUS_OS_TYPE_WINDOWS)

MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS",

usage,

" -D [home] - sets pegasus home directory\n");

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

MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD",

usage,

" -D [home] - sets pegasus home directory\n");

#else

MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD",

MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD", usage);

usage);

#endif

//cout << usage << endl;

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

}

//This needs to be called at various points in the code depending on the platform and error conditions.

//We need to delete the _cimServer reference on exit in order for the destructors to get called.

void deleteCIMServer()

{

if (_cimServer)

{

delete _cimServer;

_cimServer = 0;

}

if (_monitor)

{

delete _monitor;

}

if (dummyInitialThread)

{

Thread::clearLanguages();

delete dummyInitialThread;

}

// l10n

// Dummy function for the Thread object associated with the initial thread.

Line 315

Line 347

return((PEGASUS_THREAD_RETURN)0);

}

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

Line 371

client.setTimeout(2000);

}

catch(Exception& e)

catch(Exception&)

{

#ifdef PEGASUS_OS_OS400

//l10n

Line 360

Line 382

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

if(cimserver_kill() == -1)

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

cimserver_exit(2);

_cimServerProcess->cimserver_exitRC(2);

cimserver_exit(1);

_cimServerProcess->cimserver_exitRC(1);

#else

//l10n

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

Line 370

Line 392

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

cimserver_exit(1);

}

try

Line 418

Line 440

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

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

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

}

else

{

Line 427

Line 449

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

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

"src.Server.cimserver.SHUTDOWN_FAILED",

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

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

}

// Kill the server job.

if(cimserver_kill() == -1)

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

cimserver_exit(2);

_cimServerProcess->cimserver_exitRC(2);

#else

//l10n

//l10n - TODO

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

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

"Failed to shutdown server: ");

"Error in server shutdown: ");

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

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

{

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

//PEGASUS_STD(cerr) << PEGASUS_STD(endl);

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

}

#endif

cimserver_exit(1);

// Kill the cimserver process

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

{

//l10n - TODO

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

"src.Server.cimserver.SERVER_FORCED_SHUTDOWN",

"Forced shutdown initiated.");

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

"Forced shutdown initiated.");

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

}

catch(Exception& e)

exit(1);

#endif

}

catch(Exception&)

{

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

Line 470

Line 511

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

Uint32 maxWaitTime = timeoutValue - 2;

Boolean running = isCIMServerRunning();

Boolean running = _cimServerProcess->isCIMServerRunning();

while ( running && maxWaitTime > 0 )

{

System::sleep(1);

running = isCIMServerRunning();

running = _cimServerProcess->isCIMServerRunning();

maxWaitTime = maxWaitTime - 1;

}

if (running)

{

int kill_rc = cimserver_kill();

int kill_rc = _cimServerProcess->cimserver_kill(0);

#ifdef PEGASUS_OS_OS400

if(kill_rc == -1)

cimserver_exit(2);

_cimServerProcess->cimserver_exitRC(2);

cimserver_exit(1);

_cimServerProcess->cimserver_exitRC(1);

#endif

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

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

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) \

|| defined (PEGASUS_OS_VMS)

if (kill_rc != -1)

{

//l10n

//l10n - TODO

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

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

"src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",

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

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

"Shutdown timeout expired. CIM Server process killed.");

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

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

exit(0);

}

Line 511

Line 557

int main(int argc, char** argv)

{

String pegasusHome = String::EMPTY;

String logsDirectory = String::EMPTY;

Boolean useSLP = false;

Boolean daemonOption = false;

Boolean shutdownOption = false;

Uint32 timeoutValue = 0;

//l10n

// Set Message loading to process locale

MessageLoader::_useProcessLocale = true;

//l10n

#if defined(PEGASUS_OS_AIX) && defined(PEGASUS_HAS_MESSAGES)

setlocale(LC_ALL, "");

#endif

#ifdef PEGASUS_OS_OS400

VFYPTRS_INCDCL; // VFYPTRS local variables

// verify pointers

#pragma exception_handler (qsyvp_excp_hndlr,qsyvp_excp_comm_area,\

0,_C2_MH_ESCAPE)

for( int arg_index = 1; arg_index < argc; arg_index++ ){

VFYPTRS(VERIFY_SPP_NULL(argv[arg_index]));

}

#pragma disable_handler

// Convert the args to ASCII

for(Uint32 i = 0;i< argc;++i)

{

Line 533

Line 591

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

// Get environment variables:

Line 549

Line 608

pegasusHome = home;

}

#else

#if defined(PEGASUS_OS_AIX) && defined(PEGASUS_USE_RELEASE_DIRS)

pegasusHome = AIX_RELEASE_PEGASUS_HOME;

#elif !defined(PEGASUS_USE_RELEASE_DIRS)

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

if (tmp)

Line 556

Line 618

pegasusHome = tmp;

}

#endif

FileSystem::translateSlashes(pegasusHome);

#else

// windows only

setHome(pegasusHome);

//setHome(pegasusHome);

pegasusHome = _cimServerProcess->getHome();

#endif

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

if (argc == 1 )

{

cim_server_service(argc, argv);

}

else

{

// Get help, version, and shutdown options

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

{

const char* arg = argv[i];

if(String::equal(arg,"--help"))

{

PrintHelp(argv[0]);

exit(0);

}

else if(String::equal(arg,"--version"))

{

cout << _cimServerProcess->getVersion() << endl;

exit(0);

}

// Check for -option

if (*arg == '-')

else if (*arg == '-')

{

// Get the option

const char* option = arg + 1;

Line 589

Line 655

if (*option == OPTION_VERSION &&

strlen(option) == 1)

{

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

cout << _cimServerProcess->getVersion() << endl;

cout << PLATFORM_PRODUCT_VERSION << endl;

#else

cout << PEGASUS_VERSION << endl;

#endif

exit(0);

}

Line 605

Line 667

PrintHelp(argv[0]);

exit(0);

}

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

#if !defined(PEGASUS_USE_RELEASE_DIRS)

else if (*option == OPTION_HOME &&

(strlen(option) == 1))

{

Line 655

Line 717

(strlen(option) == 1))

{

// check to see if user is root

#ifndef PEGASUS_OS_OS400

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

{

//l10n

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

//cout << "cimserver." << endl;

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

"You must have superuser privilege to run cimserver.");

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

exit(0);

}

#endif

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

if (shutdownOption)

Line 691

Line 736

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

argc--;

}

#ifdef PEGASUS_OS_TYPE_WINDOWS

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

{

// Install as a NT service

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_install_nt_service(opt_arg))

{

//l10n

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

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

"\n$0 installed as NT Service",

"Pegasus");

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

exit(0);

}

else

{

i++;

exit(0);

}

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

{

// Remove Pegasus as an NT service

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_remove_nt_service(opt_arg))

{

//l10n

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

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

"\n$0 removed as NT Service",

"Pegasus");

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

exit(0);

}

else

{

i++;

exit(0);

}

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

{

// Start as a NT service

// Set the value for pegasusHome property

char *opt_arg = NULL;

ConfigManager::setPegasusHome(pegasusHome);

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_start_nt_service(opt_arg))

{

//l10n

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

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

"\n$0 started as NT Service",

"Pegasus");

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

exit(0);

}

else

{

exit(0);

}

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

{

// Stop as a NT service

// Do the plaform specific run

char *opt_arg = NULL;

if (i+1 < argc)

{

opt_arg = argv[i+1];

}

if(cimserver_stop_nt_service(opt_arg))

{

//l10n

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

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

"\n$0 stopped as NT Service",

"Pegasus");

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

return _cimServerProcess->platform_run( argc, argv, shutdownOption );

exit(0);

}

else

void CIMServerProcess::cimserver_stop()

{

exit(0);

_cimServer->shutdownSignal();

}

#endif

else

i++;

}

else

i++;

}

// Set the value for pegasusHome property

// The main, common, running code

// NOTE: Do NOT call exit(). Use return(), otherwise some platforms

// will fail to shutdown properly/cleanly.

// TODO: Current change minimal for platform "service" shutdown bug fixes.

// Perhpas further extract out common stuff and put into main(), put

// daemon stuff into platform specific platform_run(), etc.

// Note: make sure to not put error handling stuff that platform

// specific runs may need to deal with bettter (instead of exit(), etc).

ConfigManager::setPegasusHome(pegasusHome);

int CIMServerProcess::cimserver_run( int argc, char** argv, Boolean shutdownOption )

{

String logsDirectory = String::EMPTY;

Boolean daemonOption = false;

// Get an instance of the Config Manager.

configManager = ConfigManager::getInstance();

configManager->useConfigFiles = true;

#ifdef PEGASUS_OS_OS400

// In a special startup case for IBM OS400, when the server is

// automatically started when the machine starts up the config

// file cannot be read because of access restrictions for the

// user starting the server. In this case, we need to skip

// reading the config options and therefore any use of the config

// manager also. To make this determinations we will check to see

// if the daemon flag is set to true. If so, then there will be a

// series of checks to bracket all the calls to the configManager

// which would otherwise fail. All this will only be done for

// IBM OS400.

Boolean os400StartupOption = false;

// loop through args to check for daemon=true

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

if (strcmp(argv[i], "daemon=true") == 0)

{

os400StartupOption = true;

daemonOption = true;

}

if (!os400StartupOption)

{

// If this is the server job, then set the job

// to save the job log.

system ("QSYS/CHGJOB JOB(*) LOG(4 00 *SECLVL)");

}

#endif

// Get options (from command line and from configuration file); this

Line 824

Line 820

try

{

GetOptions(configManager, argc, argv, pegasusHome);

#ifdef PEGASUS_OS_OS400

if (os400StartupOption == false)

#endif

GetOptions(configManager, argc, argv);

}

catch (Exception& e)

{

#ifdef PEGASUS_OS_OS400

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

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

"src.Server.cimserver.SERVER_NOT_STARTED",

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

"cimserver not started: $0", e.getMessage());

#else

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

#if !defined(PEGASUS_OS_OS400)

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

"cimserver not started: $0", e.getMessage());

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

<< PEGASUS_STD(endl);

#endif

exit(1);

return(1);

}

// l10n

// Set the home directory, msg sub-dir, into the MessageLoader.

// This will be the default directory where the resource bundles

// are found.

String messagesDir = String::EMPTY;

MessageLoader::setPegasusMsgHome(ConfigManager::getHomedPath(

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

ConfigManager::getInstance()->getCurrentValue("messageDir")));

messagesDir = OS400_DEFAULT_MESSAGE_SOURCE;

#else

#ifdef PEGASUS_OS_OS400

messagesDir = ConfigManager::getHomedPath("msg");

// Still need to declare and set the connection variables.

#endif

// Will initialize to false since they are fixed at false for OS400.

MessageLoader::setPegasusMsgHome(messagesDir);

// NOTE: OS400 is a LOCAL_DOMAIN_SOCKET, so a few lines down

// the test will not be compiled in. If OS400 ever turns off that

// define, then we will need to change this code path to insure that

// one of the variables is true.

Boolean enableHttpConnection = false;

Boolean enableHttpsConnection = false;

Boolean enableSSLExportClientVerification = false;

if (os400StartupOption == false)

{

enableHttpConnection = String::equal(

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

enableHttpsConnection = String::equal(

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

enableSSLExportClientVerification = String::equal(

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

}

#else

Boolean enableHttpConnection = String::equal(

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

Boolean enableHttpsConnection = String::equal(

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

Boolean enableSSLExportClientVerification = String::equal(

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

#endif

// Make sure at least one connection is enabled

#ifndef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

if (!enableHttpConnection && !enableHttpsConnection)

{

//l10n

Line 870

Line 895

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

"Neither HTTP nor HTTPS connection is enabled. CIMServer will not be started.");

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

exit(1);

return(1);

}

#endif

Line 885

Line 910

daemonOption = true;

}

#ifdef PEGASUS_OS_OS400

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

#ifdef PEGASUS_OS_OS400

} // end if (os400StartupOption == false)

#endif

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

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

!defined(PEGASUS_OS_OS400)

!defined(PEGASUS_OS_OS400) && !defined(PEGASUS_USE_SYSLOGS)

Logger::setHomeDirectory(logsDirectory);

#endif

Line 910

Line 944

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

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

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

shutdownCIMOM(timeoutValue);

Line 920

Line 954

//"CIM Server stopped.");

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

"src.Server.cimserver.SERVER_STOPPED",

"$0 Server stopped.", "CIM");

"CIM Server stopped.");

cimserver_exitRC(0);

#else

//l10n

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

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

"$0 Server stopped.",

"CIM Server stopped.");

"CIM");

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

return(0);

#endif

cimserver_exit(0);

}

#if defined(PEGASUS_DEBUG)

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

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

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

{

useSLP = true;

}

catch (UnrecognizedConfigProperty e)

catch (UnrecognizedConfigProperty& e)

{

#ifdef PEGASUS_OS_OS400

Line 967

Line 998

#endif

}

Uint32 portNumberHttps;

// Bug 2148 - Here is the order of operations for determining the server HTTP and HTTPS ports.

Uint32 portNumberHttp;

// 1) If the user explicitly specified a port, use it.

// 2) If the user did not specify a port, get the port from the services file.

// 3) If no value is specified in the services file, use the IANA WBEM default port.

// Note that 2 and 3 are done within the System::lookupPort method

// An empty string from the ConfigManager implies that the user did not specify a port.

Uint32 portNumberHttps=0;

Uint32 portNumberHttp=0;

Uint32 portNumberExportHttps=0;

if (enableHttpsConnection)

{

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

CString portString = httpsPort.getCString();

if (httpsPort == String::EMPTY)

char* end = 0;

{

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

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

// Look up the WBEM-HTTPS port number

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

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

} else

{

// user-specified

CString portString = httpsPort.getCString();

char* end = 0;

portNumberHttps = strtol(portString, &end, 10);

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

{

InvalidPropertyValue e("httpsPort", httpsPort);

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

exit(1);

}

if (enableHttpConnection)

{

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

if (httpPort == String::EMPTY)

{

// Look up the WBEM-HTTP port number

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

} else

{

// user-specified

CString portString = httpPort.getCString();

char* end = 0;

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

portNumberHttp = strtol(portString, &end, 10);

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

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

{

InvalidPropertyValue e("httpPort", httpPort);

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

exit(1);

}

if (enableSSLExportClientVerification)

{

// Look up the WBEM-HTTP port number

// No config property is looked up to get the default port number.

// Lookup the port defined in /etc/services for the service name

// wbem-exp-https and bind to that port. If the service is not defined

// then log a warning message and do not start the cimserver.

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

Uint32 port = 0;

}

portNumberExportHttps = System::lookupPort(WBEM_EXPORT_HTTPS_SERVICE_NAME, port);

if (portNumberExportHttps == 0)

{

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

"src.Server.cimserver.EXPORT_HTTPS_PORT_NOT_DEFINED",

"Port not defined for the service wbem-exp-https. CIMServer will not be started.");

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

"Port not defined for the service wbem-exp-https. CIMServer will not be started.");

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

return(1);

}

#if defined(PEGASUS_DEBUG)

// Put out startup up message.

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

cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;

!defined(PEGASUS_OS_OS400)

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

//l10n

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

//cout <<"Starting..."

Line 1009

Line 1100

"Built $0 $1\nStarting...",

__DATE__,

__TIME__);

cout << MessageLoader::getMessage(parms)

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

<< endl;

#endif

//l10n

Line 1019

Line 1107

MessageLoader::_useProcessLocale = false;

//l10n

// Get the parent's PID before forking

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

// do we need to run as a daemon ?

if (daemonOption)

{

if(-1 == cimserver_fork())

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

#ifndef PEGASUS_OS_OS400

{

exit(-1);

return(-1);

}

#else

{

Line 1047

Line 1138

// because this thread is not in a ThreadPool, but is used

// to service CIM requests.

// The run function for the dummy Thread should never be called,

Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);

dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);

Thread::setCurrent(dummyInitialThread);

AcceptLanguages default_al = AcceptLanguages::getDefaultAcceptLanguages();

AcceptLanguages default_al;

try{

default_al = AcceptLanguages::getDefaultAcceptLanguages();

Thread::setLanguages(new AcceptLanguages(default_al));

}catch(InvalidAcceptLanguageHeader& e){

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

"src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",

"Could not convert the system process locale into a valid AcceptLanguage format.");

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

e.getMessage());

}

#ifdef PEGASUS_OS_OS400

Line 1064

Line 1165

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

"src.Server.cimserver.SERVER_FAILED_TO_INITIALIZE",

"CIM Server failed to initialize");

exit(-1);

return(-1);

}

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

umask(S_IRWXG|S_IRWXO);

#endif

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

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

umask(S_IWGRP|S_IWOTH);

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

|| defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || defined (PEGASUS_OS_VMS)

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

if(_cimServerProcess->isCIMServerRunning())

{

//l10n

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

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

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

"Unable to start $0.\n$1 is already running.",

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

"CIMServer","CIMServer");

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

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

if (daemonOption)

notify_parent(1);

_cimServerProcess->notify_parent(1);

exit(1);

return(1);

}

#endif

Line 1100

Line 1205

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

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

// ATTN: Fix this to work for multiple connections

sprintf(slp_address, "%u",

enableHttpConnection ? portNumberHttp : portNumberHttps);

serviceURL.append(slp_address);

#endif

Monitor monitor(true);

//monitor_2 monitor;

CIMServer server(&monitor);

_monitor = new Monitor();

//PEP#222

//CIMServer server(&monitor);

//CimserverHolder cimserverHolder( &server );

_cimServer = new CIMServer(_monitor);

if (enableHttpConnection)

{

server.addAcceptor(false, portNumberHttp, false);

_cimServer->addAcceptor(false, portNumberHttp, false, 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,

"src.Server.cimserver.LISTENING_ON_PORT",

"src.Server.cimserver.LISTENING_ON_HTTP_PORT",

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

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

}

if (enableHttpsConnection)

{

server.addAcceptor(false, portNumberHttps, true);

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

//l10n

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

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

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

"src.Server.cimserver.LISTENING_ON_PORT",

"src.Server.cimserver.LISTENING_ON_HTTPS_PORT",

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

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

}

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

if (enableSSLExportClientVerification)

server.addAcceptor(true, 0, false);

{

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

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

"src.Server.cimserver.LISTENING_ON_EXPORT_HTTPS_PORT",

"Listening on Export HTTPS port $0.", portNumberExportHttps);

}

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

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

//l10n

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

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

Line 1152

Line 1253

"Listening on local connection socket.");

#endif

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

#if defined(PEGASUS_DEBUG)

if (enableHttpConnection)

{

//l10n

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

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

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

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

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

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

}

if (enableHttpsConnection)

{

//l10n

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

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

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

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

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

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

}

if (enableSSLExportClientVerification)

{

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

"Listening on Export HTTPS port $0.", portNumberExportHttps);

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

}

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

# ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

//l10n

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

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

Line 1179

Line 1288

#endif

// bind throws an exception if the bind fails

server.bind();

try {

_cimServer->bind();

} catch (const BindFailedException &e)

{

#ifdef PEGASUS_DEBUG

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

"Could not bind: $0.", e.getMessage());

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

#endif

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

"src.Server.cimserver.BIND.FAILED",

"Could not bind: $0", e.getMessage());

deleteCIMServer();

return 1;

}

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

notify_parent(0);

_cimServerProcess->notify_parent(0);

time_t last = 0;

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

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

|| defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) \

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

System::removeFile(CIMSERVER_START_FILE);

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

// open the file

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

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

if (pid_file)

{

// save the pid in the file

fprintf(pid_file, "%ld\n", (long)server_pid);

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

fclose(pid_file);

}

#endif

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

#if defined(PEGASUS_DEBUG)

!defined(PEGASUS_OS_OS400)

cout << "Started. " << endl;

#endif

// Put server started message to the logger

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

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

//l10n

Logger::INFORMATION,

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

//"Started $0 version $1.",

//PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

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

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);

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

#else

//l10n

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

//"Started $0 version $1.",

//PEGASUS_NAME, PEGASUS_VERSION);

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

"src.Server.cimserver.STARTED_VERSION",

"Started $0 version $1.",

PEGASUS_NAME, PEGASUS_VERSION);

#endif

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

// has been shutdown

while( !server.terminated() )

while( !_cimServer->terminated() )

{

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

if(useSLP )

{

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

{

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

discovery->srv_reg_all(serviceURL.getCString(),

"(namespace=root/cimv2)",

"service:cim.pegasus",

"DEFAULT",

70) ;

time(&last);

}

discovery->service_listener();

_cimServer->runForever();

}

#endif

server.runForever();

}

// normal termination

// Put server shutdown message to the logger

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

//l10n

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

//"$0 stopped.", PLATFORM_PRODUCT_NAME);

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

"src.Server.cimserver.STOPPED",

"$0 stopped.", PLATFORM_PRODUCT_NAME);

#else

//l10n

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

//"$0 stopped.", PEGASUS_NAME);

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

"src.Server.cimserver.STOPPED",

"$0 stopped.", PEGASUS_NAME);

#endif

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

// Put server shutdown message to the logger

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

Logger::INFORMATION, "src.Server.cimserver.STOPPED",

"$0 stopped.", _cimServerProcess->getProductName());

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

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

|| defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || defined(PEGASUS_OS_VMS)

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

// cimserver has terminated normally.

FileSystem::removeFile(CIMSERVER_START_FILE);

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

#endif

}

catch(Exception& e)

Line 1311

Line 1396

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

if (daemonOption)

notify_parent(1);

_cimServerProcess->notify_parent(1);

deleteCIMServer();

return 1;

}

deleteCIMServer();

return 0;

}

Legend:

Removed from v.1.102
changed lines
	Added in v.1.167

No CVS admin address has been configured