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.104 and 1.134

version 1.104, 2003/09/08 14:50:34

version 1.134, 2004/05/14 14:02:53

Line 1

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

//%2003////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

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

// IBM Corp.; EMC 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 40

Line 42

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

// Modified By: Steve Hills (steve.hills@ncr.com)

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

Line 75

Line 79

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

Line 113

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

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

#include <slp/slp.h>

#endif

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

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

#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

Line 123

Line 133

# error "Unsupported platform"

#endif

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

// The command name.

Line 147

Line 154

static const char OPTION_SHUTDOWN = 's';

static const char OPTION_INSTALL[] = "install";

static const char OPTION_REMOVE[] = "remove";

static const char OPTION_START[] = "start";

static const char OPTION_STOP[] = "stop";

#if defined(PEGASUS_OS_HPUX)

static const char OPTION_BINDVERBOSE = 'X';

#endif

Line 163

Line 162

ConfigManager* configManager;

/** Helper for platform specific handling. So platform specific code

can use our single instance of CIMServer.

class CimserverHolder

{

public:

CimserverHolder( CIMServer* s )

{

cimserver_set( s );

}

virtual ~CimserverHolder()

{

cimserver_set( 0 );

}

};

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

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

void GetOptions(

ConfigManager* cm,

int& argc,

char** argv,

char** argv)

const String& pegasusHome)

{

try

{

Line 178

Line 192

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 310

Line 328

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 344

Line 352

client.setTimeout(2000);

}

catch(Exception& e)

catch(Exception&)

{

#ifdef PEGASUS_OS_OS400

//l10n

Line 356

Line 364

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

// Kill the job if it exists.

if(cimserver_kill() == -1)

cimserver_exit(2);

cimserver_exitRC(2);

cimserver_exit(1);

cimserver_exitRC(1);

#else

//l10n

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

Line 365

Line 373

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 413

Line 421

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

Line 430

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

cimserver_exit(2);

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 (cimserver_kill() == 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 476

Line 503

if (running)

{

int kill_rc = cimserver_kill();

#ifdef PEGASUS_OS_OS400

if(kill_rc == -1)

cimserver_exit(2);

cimserver_exitRC(2);

cimserver_exit(1);

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)

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 506

Line 536

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

Line 518

Line 544

//l10n

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

Line 565

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

// Get environment variables:

Line 544

Line 582

pegasusHome = home;

}

#else

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

pegasusHome = AIX_RELEASE_PEGASUS_HOME;

#else

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

if (tmp)

Line 551

Line 592

pegasusHome = tmp;

}

#endif

FileSystem::translateSlashes(pegasusHome);

#else

Line 558

Line 600

// windows only

setHome(pegasusHome);

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

Line 650

Line 685

(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_PRIVILEGE_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 686

Line 704

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

"\nPegasus installed as NT Service");

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

"\nPegasus removed as NT Service");

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

"\nPegasus started as NT Service");

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

"\nPegasus stopped as NT Service");

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

return platform_run( argc, argv, shutdownOption );

exit(0);

}

else

{

exit(0);

}

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

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

}

#endif

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

// removes corresponding options and their arguments from the command

Line 815

Line 776

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;

if (os400StartupOption == false)

{

enableHttpConnection = String::equal(

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

enableHttpsConnection = String::equal(

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

}

#else

Boolean enableHttpConnection = String::equal(

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

Boolean enableHttpsConnection = String::equal(

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

#endif

// Make sure at least one connection is enabled

#ifndef PEGASUS_LOCAL_DOMAIN_SOCKET

Line 861

Line 846

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 876

Line 861

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.

Line 884

Line 873

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

logsDirectory =

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

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

Line 901

Line 893

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

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

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

shutdownCIMOM(timeoutValue);

Line 912

Line 904

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

"src.Server.cimserver.SERVER_STOPPED",

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

}

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

Line 933

Line 926

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 1000

Line 990

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

__DATE__,

__TIME__);

cout << MessageLoader::getMessage(parms)

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

<< endl;

#endif

//l10n

Line 1016

Line 1003

if(-1 == cimserver_fork())

#ifndef PEGASUS_OS_OS400

{

exit(-1);

return(-1);

}

#else

{

Line 1040

Line 1027

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

Thread *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 1055

Line 1052

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

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

umask(S_IWGRP|S_IWOTH);

Line 1075

Line 1072

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

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

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

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

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

Line 1082

Line 1080

if (daemonOption)

notify_parent(1);

exit(1);

return(1);

}

#endif

Line 1090

Line 1088

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

#if defined(PEGASUS_USE_23HTTPMONITOR_SERVER)

Monitor monitor(true);

CIMServer server(&monitor);

#else

monitor_2 monitor;

CIMServer server(&monitor);

#endif

CimserverHolder cimserverHolder( &server );

if (enableHttpConnection)

{

server.addAcceptor(false, portNumberHttp, false);

Line 1178

Line 1170

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_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

// create a file to indicate that the cimserver has started and

// save the process id of the cimserver process in the file

Line 1230

Line 1222

while( !server.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();

}

#endif

server.runForever();

}

MessageQueueService::force_shutdown(true);

// normal termination

Line 1270

Line 1247

"$0 stopped.", PEGASUS_NAME);

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

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

// cimserver has terminated normally.

Line 1308

Line 1285

return 0;

}

Legend:

Removed from v.1.104
changed lines
	Added in v.1.134

No CVS admin address has been configured