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.90 and 1.91

version 1.90, 2003/04/02 00:44:04

version 1.91, 2003/05/07 18:48:16

Line 159

#endif

static const String PROPERTY_TIMEOUT = "shutdownTimeout";

static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";

ConfigManager* configManager;

Line 361

Line 360

catch(Exception& e)

{

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

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

// "Empty HTTP response message" HTTP error response. To be sure

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

// CIM Server gets shutdown, if CIM Server is still running at

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

// this time, we will kill the cimserver process.

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

// timeout with a "connection timeout" exception.

// give CIM Server some time to finish up

//System::sleep(1);

//cimserver_kill();

// Check to see if CIMServer is still running. If CIMServer

// is still running and the shutdown timeout has not expired,

// loop and wait one second until either CIM Server is

// loop and wait one second until either the CIM Server is

// terminated or until timeout expires. If timeout expires

// terminated or timeout expires. If timeout expires and

// and CIMServer is still running, kill the CIMServer

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

// process.

Uint32 maxWaitTime = timeoutValue - 2;

Boolean running = isCIMServerRunning();

Line 396

Line 389

cimserver_exit(2);

cimserver_exit(1);

#endif

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

if (kill_rc != -1)

{

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

exit(0);

}

#endif

}

//catch(Exception& e)

//{

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

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

// exit(1);

//}

return;

}

Line 813

Line 808

}

#endif

#ifdef PEGASUS_OS_HPUX

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

umask(S_IWGRP|S_IWOTH);

Line 899

Line 894

time_t last = 0;

#if defined(PEGASUS_OS_HPUX)

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

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

System::removeFile(CIMSERVER_START_FILE);

// open the file

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

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

if (pid_file)

{

// save the pid in the file

Line 917

Line 912

fclose(pid_file);

}

#endif

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

!defined(PEGASUS_OS_OS400)

cout << "Started. " << endl;

Line 972

Line 968

"$0 stopped.", PEGASUS_NAME);

#endif

#if defined(PEGASUS_OS_HPUX)

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

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

// cimserver has terminated normally.

FileSystem::removeFile(CIMSERVERSTART_FILE);

FileSystem::removeFile(CIMSERVER_START_FILE);

#endif

}

catch(Exception& e)

Legend:

Removed from v.1.90
changed lines
	Added in v.1.91

No CVS admin address has been configured