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.63 and 1.74

version 1.63, 2002/07/19 20:42:55

version 1.74, 2002/09/25 02:18:17

Line 32

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

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

Line 83

Line 86

#include <Pegasus/Common/Config.h>

#include <Pegasus/Common/Constants.h>

#include <Pegasus/suballoc/suballoc.h>

#include <iostream>

#include <cassert>

#include <cstdlib>

Line 99

Line 101

#include <Pegasus/Client/CIMClient.h>

#include <Pegasus/Server/ShutdownService.h>

#include <Pegasus/Common/Destroyer.h>

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

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

#include <slp/slp.h>

#endif

Line 107

Line 109

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

# if defined(PEGASUS_OS_OS400)

# include "cimserver_os400.cpp"

# else

# include "cimserver_unix.cpp"

#endif

#else

# error "Unsupported platform"

#endif

Line 244

Line 250

// set client timeout to 2 seconds

client.setTimeOut(2000);

client.setTimeout(2000);

}

catch(CIMClientException& e)

catch(Exception& e)

{

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

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

#ifdef PEGASUS_OS_OS400

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

// Kill the job if it exists.

cimserver_kill();

#endif

exit(0);

}

Line 260

Line 271

String referenceStr = "//";

referenceStr.append(hostStr);

referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN);

referenceStr.append("/");

referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN.getString());

referenceStr.append(":");

referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN);

referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN.getString());

CIMObjectPath reference(referenceStr);

Line 285

Line 297

inParams,

outParams);

}

catch(CIMClientCIMException& e)

catch(CIMException& e)

{

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

if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)

Line 297

Line 309

{

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

}

#ifdef PEGASUS_OS_OS400

// Kill the server job.

cimserver_kill();

#endif

exit(1);

}

catch(CIMClientException& e)

catch(Exception& e)

{

// This may mean the CIM Server has been terminated and returns a

Line 334

Line 350

cimserver_kill();

}

catch(Exception& e)

//catch(Exception& e)

{

//{

PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";

// PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";

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

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

exit(1);

// exit(1);

}

//}

return;

}

Line 361

Line 377

Boolean shutdownOption = false;

Uint32 timeoutValue = 0;

#ifdef PEGASUS_OS_OS400

// Initialize Pegasus home to the shipped OS/400 directory.

pegasusHome = OS400_DEFAULT_PEGASUS_HOME;

#endif

// Get environment variables:

Line 452

Line 473

// check to see if user is root

#ifndef PEGASUS_OS_OS400

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

{

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

cout << "cimserver." << endl;

exit(0);

}

#endif

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

Line 577

Line 600

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

ArrayDestroyer<char> timeoutCString(configTimeout.allocateCString());

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

timeoutValue = strtol(timeoutCString.getPointer(), (char **)0, 10);

shutdownCIMOM(timeoutValue);

Line 625

Line 647

if (useSSL)

{

char* p = httpsPort.allocateCString();

char* end = 0;

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

CString portString = httpsPort.getCString();

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

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

delete [] p;

// Look up the WBEM-HTTPS port number

Line 639

Line 660

}

else

{

char* p = httpPort.allocateCString();

char* end = 0;

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

CString portString = httpPort.getCString();

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

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

delete [] p;

// Look up the WBEM-HTTP port number

Line 671

Line 691

exit(-1);

}

#ifdef PEGASUS_OS_OS400

// Special server initialization code for OS/400.

if (cimserver_initialize() != 0)

{

// do some logging here!

exit(-1);

}

#endif

#ifdef PEGASUS_OS_HPUX

umask(S_IWGRP|S_IWOTH);

#endif

Line 683

Line 712

String serviceURL;

serviceURL.assign("service:cim.pegasus://");

String host_name = slp_get_host_name();

serviceURL += host_name;

serviceURL.append(host_name);

serviceURL += ":";

serviceURL.append(":");

serviceURL += address;

serviceURL.append(address);

char *url = serviceURL.allocateCString();

// free(host_name);

#endif

Monitor monitor(true);

Line 702

Line 729

server.bind(portNumber);

// notify parent process to terminate so user knows that cimserver

// is ready to serve CIM requests.

notify_parent();

time_t last = 0;

#if defined(PEGASUS_OS_HPUX)

Line 749

Line 780

{

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

{

if( discovery != NULL && url != NULL )

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

discovery->srv_reg_all(url,

discovery->srv_reg_all(serviceURL.getCString(),

"(namespace=root/cimv2)",

"service:cim.pegasus",

"DEFAULT",

Legend:

Removed from v.1.63
changed lines
	Added in v.1.74

No CVS admin address has been configured