(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.44 and 1.45

version 1.44, 2002/05/03 18:15:13 version 1.45, 2002/05/11 00:24:43
Line 79 
Line 79 
 #include <iostream> #include <iostream>
 #include <cassert> #include <cassert>
 #include <cstdlib> #include <cstdlib>
   #include <fstream>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/Monitor.h> #include <Pegasus/Common/Monitor.h>
 #include <Pegasus/Server/CIMServer.h> #include <Pegasus/Server/CIMServer.h>
Line 134 
Line 135 
 static const String NAMESPACE = "root/PG_Internal"; static const String NAMESPACE = "root/PG_Internal";
 static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService"; static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService";
 static const String PROPERTY_TIMEOUT = "operationTimeout"; static const String PROPERTY_TIMEOUT = "operationTimeout";
   static const String CIMSERVERSTART_FILE = "/etc/wbem/cimserver_start.conf";
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
Line 248 
Line 250 
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
             "Failed to connect to $0 $1.", PEGASUS_NAME, e.getMessage());             "Failed to connect to $0 $1.", PEGASUS_NAME, e.getMessage());
  
         PEGASUS_STD(cerr) << "Failed to connect to server: " << e.getMessage() << PEGASUS_STD(endl);          PEGASUS_STD(cerr) << "Failed to connect to server: ";
         exit(1);          PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
           exit(0);
     }     }
  
     try     try
Line 286 
Line 289 
             "$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);             "$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);
  
     }     }
     catch(CIMClientCIMException& e)      catch(CIMClientException& e)
       {
           //
           // This may mean the cimserver has been terminated and returns the
           // "Empty HTTP response message" HTTP error response.  To be sure,
           // we need to check if cimserver is indeed terminated.
           //
   #ifdef PEGASUS_OS_TYPE_UNIX
           System::sleep(1);
           int ret = system("ps -ef | grep cimserver | grep -v grep | grep -v cimserverd >/dev/null");
           if (ret == 0)
           {
               // cimserver has been terminated
               // Put server shutdown message to the logger
               Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                   "$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);
           }
           else
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: " << e.getMessage() << PEGASUS_STD(endl);              // cimserver is still running
               PEGASUS_STD(cerr) << "Failed to shutdown server: ";
               PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         exit(1);         exit(1);
     }     }
     catch(CIMClientException& e)  #endif
       }
       catch(CIMClientCIMException& e)
     {     {
         // this may mean the cimserver has been terminated          PEGASUS_STD(cerr) << "Failed to shutdown server: ";
           PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
           exit(1);
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: " << e.getMessage() << PEGASUS_STD(endl);          PEGASUS_STD(cerr) << "Failed to shutdown server: ";
           PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         exit(1);         exit(1);
     }     }
  
Line 597 
Line 624 
             }             }
  
             shutdownCIMOM(forceOption, timeoutValue);             shutdownCIMOM(forceOption, timeoutValue);
   
             cout << "Pegasus CIM Server terminated." << endl;             cout << "Pegasus CIM Server terminated." << endl;
             exit(0);             exit(0);
         }         }
Line 704 
Line 732 
  
         time_t last = 0;         time_t last = 0;
  
   #if defined(PEGASUS_OS_HPUX)
           //
           // create a file to indicate that the cimserver has started
           //
           fstream fs;
           ArrayDestroyer<char> p(CIMSERVERSTART_FILE.allocateCString());
           fs.open(p.getPointer(), ios::in | ios::out);
           if (!fs)
           {
               //
               // failed to create the file, write an entry to the log file
               // and proceed
               //
               Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                   "Failed to open the $0 file needed by cimserverd.",
                   CIMSERVERSTART_FILE);
           }
           else
           {
               fs.close();
           }
   #endif
   
         //         //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown
Line 730 
Line 781 
           server.runForever();           server.runForever();
         }         }
  
         // This statement is unrechable!  
         //         //
         // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          // normal termination
         //   "Normal Termination");          //
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "Normal Termination");
   
   #if defined(PEGASUS_OS_HPUX)
           //
           // close the file at startup time to indicate that the cimserver
           // has terminated normally.
           //
           FileSystem::removeFile(CIMSERVERSTART_FILE);
   #endif
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2