(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.36 and 1.57

version 1.36, 2001/12/20 21:33:04 version 1.57, 2002/06/01 00:25:05
Line 30 
Line 30 
 // //
 // Modified By: Jenny Yu (jenny_yu@hp.com) // Modified By: Jenny Yu (jenny_yu@hp.com)
 // //
   // Modified By: Sushma Fernandes (sushma_fernandes@hp.com)
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 45 
Line 47 
 // //
 // To shutdown pegasus, use the -s option: // To shutdown pegasus, use the -s option:
 // //
 // cimserver -s [-f] [-T timeout_value]  // cimserver -s [-t timeout_value]
 // //
 // To run pegasus as an NT service, there are FOUR  different possibilities: // To run pegasus as an NT service, there are FOUR  different possibilities:
 // //
Line 74 
Line 76 
  
  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
   #include <Pegasus/suballoc/suballoc.h>
 #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>
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
 #include <Pegasus/Protocol/Handler.h>  
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Common/HTTPConnector.h>  
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
 #ifndef PEGASUS_OS_ZOS  #include <Pegasus/Common/Destroyer.h>
   #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)
 #include <slp/slp.h> #include <slp/slp.h>
 #endif #endif
  
Line 128 
Line 131 
  
 static const char OPTION_FORCE       = 'f'; static const char OPTION_FORCE       = 'f';
  
 static const char OPTION_TIMEOUT     = 'T';  static const char OPTION_TIMEOUT     = 't';
   
   #if defined(PEGASUS_OS_HPUX)
   static const char OPTION_BINDVERBOSE = 'X';
   #endif
  
 static const String NAMESPACE = "root/cimv2";  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 = "shutdownTimeout";
   static const String CIMSERVERSTART_FILE = "/etc/wbem/cimserver_start.conf";
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
 void GetEnvironmentVariables(  
     const char* arg0,  
     String& pegasusHome)  
 {  
     // Get environment variables:  
   
     const char* tmp = getenv("PEGASUS_HOME");  
   
     if (!tmp)  
     {  
         cerr << arg0 << ": PEGASUS_HOME environment variable undefined" << endl;  
         exit(1);  
     }  
   
     pegasusHome = tmp;  
     FileSystem::translateSlashes(pegasusHome);  
 }  
   
 void SetEnvironmentVariables(  
     const char* arg0)  
 {  
     cout << "PEGASUS_HOME is now " << arg0 << endl;  
   
     String str = "PEGASUS_HOME=";  
     str += arg0;  
     char* tmp = str.allocateCString();  
     putenv(tmp);  
   
     // Note: don't delete tmp! putenv() uses it.  
 }  
   
 /** GetOptions function - This function defines the Options Table /** GetOptions function - This function defines the Options Table
     and sets up the options from that table using the config manager.     and sets up the options from that table using the config manager.
 */ */
Line 176 
Line 153 
     char** argv,     char** argv,
     const String& pegasusHome)     const String& pegasusHome)
 { {
     String currentFile = pegasusHome + "/" + CURRENT_CONFIG_FILE;  
     String plannedFile = pegasusHome + "/" + PLANNED_CONFIG_FILE;  
   
     try     try
     {     {
         cm->mergeConfigFiles(currentFile, plannedFile);          cm->mergeConfigFiles();
  
         cm->mergeCommandLine(argc, argv);         cm->mergeCommandLine(argc, argv);
     }     }
Line 227 
Line 201 
     usage.append ("    -v          - displays pegasus version number\n");     usage.append ("    -v          - displays pegasus version number\n");
     usage.append ("    -h          - prints this help message\n");     usage.append ("    -h          - prints this help message\n");
     usage.append ("    -D [home]   - sets pegasus home directory\n");     usage.append ("    -D [home]   - sets pegasus home directory\n");
     usage.append ("    -t          - turns tracing on\n");  
     usage.append ("    -t          - turns on trace of client IO to console\n");  
     usage.append ("    -l          - turns on trace of client IO to trace file\n");  
     usage.append ("    -d          - runs pegasus as a daemon\n");     usage.append ("    -d          - runs pegasus as a daemon\n");
     usage.append ("    -s [-f] [-T timeout] \n");      usage.append ("    -s [-t timeout] \n");
     usage.append ("                - shuts down pegasus\n");     usage.append ("                - shuts down pegasus\n");
   #if !defined(PEGASUS_OS_HPUX)
     usage.append ("    -cleanlogs  - clears the log files at startup\n");     usage.append ("    -cleanlogs  - clears the log files at startup\n");
     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");
     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");
     usage.append ("    -slp        - registers pegasus as a service with SLP\n\n");     usage.append ("    -slp        - registers pegasus as a service with SLP\n\n");
     usage.append ("    -SSL        - uses SSL\n\n");     usage.append ("    -SSL        - uses SSL\n\n");
   #endif
     usage.append ("  configProperty=value\n");     usage.append ("  configProperty=value\n");
     usage.append ("    port=nnnn            - sets port number to listen on\n");     usage.append ("    port=nnnn            - sets port number to listen on\n");
     usage.append ("    home=/pegasus/bin    - sets pegasus home directory\n");  
     usage.append ("    logdir=/pegasus/logs - directory for log files\n");     usage.append ("    logdir=/pegasus/logs - directory for log files\n");
  
     cout << endl;     cout << endl;
Line 250 
Line 221 
     cout << usage << endl;     cout << usage << endl;
 } }
  
 void shutdownCIMOM(Boolean forceOption, Uint32 timeoutValue)  void shutdownCIMOM(Uint32 timeoutValue)
 { {
     //     //
     // Create CIMClient object     // Create CIMClient object
     //     //
     Monitor* monitor = new Monitor;      CIMClient client;
     HTTPConnector* httpConnector = new HTTPConnector(monitor);  
     CIMClient client(monitor, httpConnector);  
  
     //     //
     // Get the port number      // Get local host name
     //     //
     String portNumberStr = configManager->getCurrentValue("port");  
   
     String hostStr = System::getHostName();     String hostStr = System::getHostName();
     hostStr.append(":");  
     hostStr.append(portNumberStr);  
   
     // Put server shutdown message to the logger  
     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
         "Shutdown $0 on port $1.", PEGASUS_NAME, portNumberStr);  
  
     //     //
     // open connection to CIMOM     // open connection to CIMOM
     //     //
     try     try
     {     {
         client.connect(hostStr.allocateCString());          client.connectLocal();
   
           //
           // set client timeout to 2 seconds more than the shutdown timeout
           // so that the command client does not timeout before the cimserver
           // terminates
           //
           Uint32 clientTimeout;
           if (timeoutValue == 0)
           {
               String configTimeout =
                   configManager->getCurrentValue("shutdownTimeout");
              ArrayDestroyer<char> timeoutCString(configTimeout.allocateCString());
               clientTimeout =
                   ((strtol(timeoutCString.getPointer(), (char **)0,10))+2)*1000;
     }     }
     catch(Exception& e)          else
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,              clientTimeout = (timeoutValue + 2)*1000;
             "Failed to connect to $0 $1.", PEGASUS_NAME, e.getMessage());          }
  
         PEGASUS_STD(cerr) << "Failed to connect to server: " << e.getMessage() << PEGASUS_STD(endl);          client.setTimeOut(clientTimeout);
         exit(1);      }
       catch(CIMClientException& 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);
           exit(0);
     }     }
  
     try     try
     {     {
         //         //
         // construct CIMReference          // construct CIMObjectPath
         //         //
         String referenceStr = "//";         String referenceStr = "//";
         referenceStr.append(hostStr);         referenceStr.append(hostStr);
         referenceStr.append("/root/cimv2:PG_ShutdownService");          referenceStr.append(PEGASUS_NAMESPACENAME_CIMV2);
         CIMReference reference(referenceStr);          referenceStr.append(":");
           referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN);
           CIMObjectPath reference(referenceStr);
  
         //         //
         // issue the invokeMethod request on the shutdown method         // issue the invokeMethod request on the shutdown method
Line 304 
Line 286 
         Array<CIMParamValue> inParams;         Array<CIMParamValue> inParams;
         Array<CIMParamValue> outParams;         Array<CIMParamValue> outParams;
  
         if (forceOption)          // set force option to true for now
         {          inParams.append(CIMParamValue("force",
             inParams.append(CIMParamValue(              CIMValue(Boolean(true))));
                 CIMParameter("force", CIMType::STRING),  
                 CIMValue("TRUE")));  
         }  
         else  
         {  
             inParams.append(CIMParamValue(  
                 CIMParameter("force", CIMType::STRING),  
                 CIMValue("FALSE")));  
         }  
  
         inParams.append(CIMParamValue(          inParams.append(CIMParamValue("timeout",
             CIMParameter("timeout", CIMType::UINT32),              CIMValue(Uint32(timeoutValue))));
             CIMValue(timeoutValue)));  
  
         CIMValue retValue = client.invokeMethod(         CIMValue retValue = client.invokeMethod(
             NAMESPACE,             NAMESPACE,
Line 327 
Line 299 
             "shutdown",             "shutdown",
             inParams,             inParams,
             outParams);             outParams);
       }
         // Put server shutdown message to the logger      catch(CIMClientCIMException& e)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,      {
             "$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);          PEGASUS_STD(cerr) << "Failed to shutdown server: ";
           PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
           exit(1);
       }
       catch(CIMClientException& e)
       {
           //
           // This may mean the CIM Server has been terminated and returns a
           // "Empty HTTP response message" HTTP error response.  To be sure
           // CIM Server gets shutdown, if CIM Server is still running at
           // this time, we will kill the cimserver process.
           //
           // give CIM Server some time to finish up
           //
           System::sleep(1);
           cimserver_kill();
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: " << e.getMessage() << PEGASUS_STD(endl);          PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";
           PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         exit(1);         exit(1);
     }     }
  
Line 349 
Line 336 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOTrace = false;  
     Boolean pegasusIOLog = false;     Boolean pegasusIOLog = false;
     String portOption = String::EMPTY;      String httpPort = String::EMPTY;
       String httpsPort = String::EMPTY;
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean useSLP = false;     Boolean useSLP = false;
     Boolean useSSL = false;     Boolean useSSL = false;
     Boolean daemonOption = false;     Boolean daemonOption = false;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Boolean forceOption = false;  
     Boolean timeoutOption = false;     Boolean timeoutOption = false;
     String  timeoutStr  = String::EMPTY;     String  timeoutStr  = String::EMPTY;
     long timeoutValue  = 0;     long timeoutValue  = 0;
  
       //
       // Get environment variables:
       //
       const char* tmp = getenv("PEGASUS_HOME");
   
       if (tmp)
       {
           pegasusHome = tmp;
       }
   
       FileSystem::translateSlashes(pegasusHome);
   
     // on Windows NT if there are no command-line options, run as a service     // on Windows NT if there are no command-line options, run as a service
  
     if (argc == 1 )     if (argc == 1 )
Line 403 
Line 401 
                     if (i + 1 < argc)                     if (i + 1 < argc)
                     {                     {
                         pegasusHome.assign(argv[i + 1]);                         pegasusHome.assign(argv[i + 1]);
                         SetEnvironmentVariables(argv[i + 1]);  
                     }                     }
                     else                     else
                     {                     {
Line 414 
Line 411 
                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));
                     argc -= 2;                     argc -= 2;
                 }                 }
   #if defined(PEGASUS_OS_HPUX)
                 //                 //
                 // Check to see if user asked for shutdown (-s option):                  // Check to see if user asked for the version (-X option):
                 //  
                 else if (*option == OPTION_SHUTDOWN)  
                 {  
                     //  
                     // Check to see if shutdown has already been specified:  
                     //                     //
                     if (shutdownOption)                  if (*option == OPTION_BINDVERBOSE)
                     {                     {
                         cout << "Duplicate shutdown option specified." << endl;                      System::bindVerbose = true;
                         exit(0);                      cout << "Unsupported debug option, BIND_VERBOSE, enabled."
                     }                           << endl;
                     shutdownOption = true;  
   
                     // remove the option from the command line                     // remove the option from the command line
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc--;                     argc--;
                 }                 }
                 else if (*option == OPTION_FORCE)  #endif
                   //
                   // Check to see if user asked for shutdown (-s option):
                   //
                   else if (*option == OPTION_SHUTDOWN)
                 {                 {
   
                     //                     //
                     // Check to see if shutdown has been specified:                      // check to see if user is root
                     //                     //
                     if (!shutdownOption)                      if (!System::isPrivilegedUser(System::getEffectiveUserName()))
                     {                     {
                         cout << "Invalid option -" << option << endl;                          cout << "You must have superuser privilege to run ";
                           cout << "cimserver." << endl;
                         exit(0);                         exit(0);
                     }                     }
  
                     //                     //
                     // Check to see if force has already been specified:                      // Check to see if shutdown has already been specified:
                     //                     //
                     if (forceOption)                      if (shutdownOption)
                     {                     {
                         cout << "Duplicate force option specified." << endl;                          cout << "Duplicate shutdown option specified." << endl;
                         exit(0);                         exit(0);
                     }                     }
  
                     forceOption = true;                      shutdownOption = true;
  
                     // remove the option from the command line                     // remove the option from the command line
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
Line 515 
Line 512 
         }         }
     }     }
  
     if (pegasusHome.size() == 0)      //
         GetEnvironmentVariables(argv[0], pegasusHome);      // Set the value for pegasusHome property
       //
       ConfigManager::setPegasusHome(pegasusHome);
  
     //     //
     // Get an instance of the Config Manager.     // Get an instance of the Config Manager.
Line 582 
Line 581 
  
         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))
         {         {
             Handler::setMessageLogTrace(true);  
             pegasusIOLog = true;             pegasusIOLog = true;
         }         }
  
Line 592 
Line 590 
         // ATTN-KS: create String based directory functions.         // ATTN-KS: create String based directory functions.
  
         logsDirectory = configManager->getCurrentValue("logdir");         logsDirectory = configManager->getCurrentValue("logdir");
           logsDirectory =
               ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));
  
         // Set up the Logger. This does not open the logs         // Set up the Logger. This does not open the logs
         // Might be more logical to clean before set.         // Might be more logical to clean before set.
         // ATTN: Need tool to completely disable logging.         // ATTN: Need tool to completely disable logging.
  
   #ifndef PEGASUS_OS_HPUX
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
   #endif
  
         //         //
         // Check to see if we need to shutdown CIMOM         // Check to see if we need to shutdown CIMOM
Line 620 
Line 622 
                 }                 }
             }             }
  
             shutdownCIMOM(forceOption, timeoutValue);              shutdownCIMOM(timeoutValue);
             cout << "Pegasus CIM Server terminated." << endl;  
               cout << "Pegasus CIM Server stopped." << endl;
             exit(0);             exit(0);
         }         }
  
         //         //
         // Grab the port option:          // Get the port numbers
         //         //
  
         portOption = configManager->getCurrentValue("port");          httpPort = configManager->getCurrentValue("httpPort");
   
         //  
         // Check the trace options and set global variable  
         //  
  
         if (String::equal(configManager->getCurrentValue("trace"), "true"))          httpsPort = configManager->getCurrentValue("httpsPort");
         {  
             Handler::setMessageTrace(true);  
             pegasusIOTrace = true;  
             cout << "Trace Set" << endl;  
         }  
  
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
   #ifndef PEGASUS_OS_HPUX
         cout << "Logs Directory = " << logsDirectory << endl;         cout << "Logs Directory = " << logsDirectory << endl;
   #endif
  
         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))
         {         {
Line 665 
Line 661 
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
     }     }
  
     char* address = portOption.allocateCString();      Uint32 portNumber;
   
       char address[32];
   
       if (useSSL)
       {
           char* p = httpsPort.allocateCString();
           char* end = 0;
           Uint32 port = strtol(p, &end, 10);
           assert(end != 0 && *end == '\0');
           delete [] p;
   
           //
           // Look up the WBEM-HTTPS port number
           //
           portNumber = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);
           sprintf(address, "%u", portNumber);
       }
       else
       {
           char* p = httpPort.allocateCString();
           char* end = 0;
           Uint32 port = strtol(p, &end, 10);
           assert(end != 0 && *end == '\0');
           delete [] p;
   
           //
           // Look up the WBEM-HTTP port number
           //
           portNumber = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);
           sprintf(address, "%u", portNumber);
       }
  
     // Put out startup up message.     // Put out startup up message.
     cout << PEGASUS_NAME << PEGASUS_VERSION <<     cout << PEGASUS_NAME << PEGASUS_VERSION <<
          " on port " << address << endl;          " on port " << address << endl;
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;     cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     cout <<"Started..."      cout <<"Starting..."
          << (pegasusIOTrace ? " Tracing to Display ": " ")  
          << (pegasusIOLog ? " Tracing to Log ": " ")          << (pegasusIOLog ? " Tracing to Log ": " ")
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
          << (useSSL ? " Use SSL " : " No SSL ")          << (useSSL ? " Use SSL " : " No SSL ")
         << endl;         << endl;
  
     // Put server start message to the logger  
     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
         "Start $0 $1 port $2 $3 $4 $5",  
                 PEGASUS_NAME,  
                 PEGASUS_VERSION,  
                 address,  
                 (pegasusIOTrace ? " Tracing": " "),  
                 (useSLP ? " SLP on " : " SLP off "),  
                 (useSSL ? " Use SSL " : " No SSL "));  
   
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
     {     {
Line 698 
Line 714 
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
     {     {
 #ifndef PEGASUS_OS_ZOS  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)
         slp_client *discovery = new slp_client() ;;         slp_client *discovery = new slp_client() ;;
         String serviceURL;         String serviceURL;
         serviceURL.assign("service:cim.pegasus://");         serviceURL.assign("service:cim.pegasus://");
Line 711 
Line 727 
 #endif #endif
  
         Monitor monitor;         Monitor monitor;
         CIMServer server(&monitor, pegasusHome, useSSL);          CIMServer server(&monitor, useSSL);
  
         // bind throws an exception of the bind fails          // bind throws an exception if the bind fails
   #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
           cout << "Binding to domain socket" << endl;
   #else
         cout << "Binding to " << address << endl;         cout << "Binding to " << address << endl;
   #endif
  
         char* end = 0;  
         long portNumber = strtol(address, &end, 10);  
         assert(end != 0 && *end == '\0');  
         server.bind(portNumber);         server.bind(portNumber);
  
         delete [] address;  
   
         time_t last = 0;         time_t last = 0;
  
   #if defined(PEGASUS_OS_HPUX)
           //
           // 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);
   
           // open the file
           FILE *pid_file = fopen(fname, "w");
           if (pid_file)
           {
               // save the pid in the file
               fprintf(pid_file, "%ld\n", (long)server_pid);
               fclose(pid_file);
           }
   #endif
           cout << "Started. " << endl;
   
           // Put server started message to the logger
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                       "Started $0 version $1 on port $2.",
                       PEGASUS_NAME, PEGASUS_VERSION, address);
   
   
         //         //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown
         //         //
         while( !server.terminated() )         while( !server.terminated() )
         {         {
 #ifndef PEGASUS_OS_ZOS  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)
           if(useSLP  )           if(useSLP  )
           {           {
             if(  (time(NULL) - last ) > 60 )             if(  (time(NULL) - last ) > 60 )
Line 751 
Line 792 
           server.runForever();           server.runForever();
         }         }
  
         // This statement is unrechable!  
         //         //
         // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          // normal termination
         //   "Normal Termination");          //
           // Put server shutdown message to the logger
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "$0 stopped.", PEGASUS_NAME);
   
   #if defined(PEGASUS_OS_HPUX)
           //
           // close the file created at startup time to indicate that the
           // cimserver has terminated normally.
           //
           FileSystem::removeFile(CIMSERVERSTART_FILE);
   #endif
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
             "Abnormal Termination $0", e.getMessage());              "$0 .Abnormal Termination.", e.getMessage());
  
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
           return 1;
     }     }
  
     return 0;     return 0;


Legend:
Removed from v.1.36  
changed lines
  Added in v.1.57

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2