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.121 and 1.141

version 1.121, 2003/10/22 14:26:19

version 1.141, 2004/10/17 20:40:39

Line 1

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

//%2004////////////////////////////////////////////////////////////////////////

// Company, L. P., IBM Corp., 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.

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

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

Line 112

Line 114

#include <Pegasus/Config/ConfigManager.h>

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

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

Uint32 parentPid = 0;

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

Line 192

Line 195

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 235

Line 242

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)

#if !defined(PEGASUS_USE_RELEASE_DIRS)

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

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

Line 272

Line 279

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)

#if !defined(PEGASUS_USE_RELEASE_DIRS)

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

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

Line 303

Line 309

#if defined(PEGASUS_OS_TYPE_WINDOWS)

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

#elif defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)

#elif defined(PEGASUS_OS_USE_RELEASE_DIRS)

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

#else

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

#endif

//cout << usage << endl;

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

}

Line 506

Line 511

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

Line 539

Line 544

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

Line 561

Line 571

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

#ifndef PEGASUS_OS_TYPE_WINDOWS

// Get environment variables:

Line 577

Line 588

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 584

Line 598

pegasusHome = tmp;

}

#endif

FileSystem::translateSlashes(pegasusHome);

#else

Line 626

Line 641

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 676

Line 691

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

Line 752

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

}

#endif

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

Line 762

Line 783

try

{

#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

return(1);

}

Line 779

Line 809

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

Line 823

Line 873

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 831

Line 885

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 871

Line 928

#endif

}

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

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

"Logs Directory = ");

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

#endif

}

catch (UnrecognizedConfigProperty e)

catch (UnrecognizedConfigProperty& e)

{

#ifdef PEGASUS_OS_OS400

Line 905

Line 959

Uint32 portNumberHttps;

Uint32 portNumberHttp;

Uint32 portNumberExportHttps;

if (enableHttpsConnection)

{

Line 934

Line 989

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

}

if (enableSSLExportClientVerification)

{

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

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) && \

!defined(PEGASUS_OS_OS400)

cout << PEGASUS_NAME << PEGASUS_VERSION << endl;

//l10n

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

Line 952

Line 1032

MessageLoader::_useProcessLocale = false;

//l10n

// Get the parent's PID before forking

parentPid = System::getPID();

// do we need to run as a daemon ?

if (daemonOption)

{

Line 986

Line 1069

try{

default_al = AcceptLanguages::getDefaultAcceptLanguages();

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

}catch(InvalidAcceptLanguageHeader e){

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

Line 1012

Line 1095

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

Line 1131

#if defined(PEGASUS_MONITOR2)

#if defined(PEGASUS_USE_23HTTPMONITOR_SERVER)

monitor_2 monitor;

Monitor monitor(true);

CIMServer server(&monitor);

#else

monitor_2 monitor;

Monitor monitor(true);

CIMServer server(&monitor);

#endif

Line 1061

Line 1143

if (enableHttpConnection)

{

server.addAcceptor(false, portNumberHttp, false);

server.addAcceptor(false, portNumberHttp, false, false);

//l10n

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

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

Line 1072

Line 1154

}

if (enableHttpsConnection)

{

server.addAcceptor(false, portNumberHttps, true);

server.addAcceptor(false, portNumberHttps, true, false);

//l10n

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

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

Line 1080

Line 1162

"src.Server.cimserver.LISTENING_ON_HTTPS_PORT",

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

}

if (enableSSLExportClientVerification)

{

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

}

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

server.addAcceptor(true, 0, false);

server.addAcceptor(true, 0, false, false);

//l10n

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

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

Line 1090

Line 1181

"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

Line 1107

Line 1198

"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

//l10n

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

Line 1126

Line 1225

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)

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

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

Line 1145

Line 1244

}

#endif

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

#if defined(PEGASUS_DEBUG)

!defined(PEGASUS_OS_OS400)

cout << "Started. " << endl;

#endif

Line 1203

Line 1301

"$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 1241

Line 1339

return 0;

}

Legend:

Removed from v.1.121
changed lines
	Added in v.1.141

No CVS admin address has been configured