(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.87 and 1.93

version 1.87, 2003/03/25 23:39:59 version 1.93, 2003/05/27 21:37:03
Line 38 
Line 38 
 // //
 // Modified By: Dave Rosckes (rosckes@us.ibm.com) // Modified By: Dave Rosckes (rosckes@us.ibm.com)
 // //
   // Modified By: Humberto Rivero (hurivero@us.ibm.com)
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 157 
Line 159 
 #endif #endif
  
 static const String PROPERTY_TIMEOUT = "shutdownTimeout"; static const String PROPERTY_TIMEOUT = "shutdownTimeout";
 static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";  
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
Line 222 
Line 223 
     usage.append ("    -D [home]   - sets pegasus home directory\n");     usage.append ("    -D [home]   - sets pegasus home directory\n");
 #endif #endif
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");      usage.append ("    -install [name] - installs pegasus as a Windows NT Service\n");
     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");      usage.append ("                      [name] is optional and overrides the\n");
     usage.append ("    -start    - starts pegasus as a Windows NT Service\n");      usage.append ("                      default CIM Server Service Name\n");
     usage.append ("    -stop     - stops pegasus as a Windows NT Service\n");      usage.append ("    -remove [name]  - removes pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n");
       usage.append ("    -start [name]   - starts pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n");
       usage.append ("    -stop [name]    - stops pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n\n");
 #endif #endif
     usage.append ("  configProperty=value\n");     usage.append ("  configProperty=value\n");
     usage.append ("                - sets CIM Server configuration property\n");     usage.append ("                - sets CIM Server configuration property\n");
Line 240 
Line 249 
     cout << usage << endl;     cout << usage << endl;
 } }
  
   //
   // cimserver_exit: platform specific exit routine calls
   //
   void cimserver_exit( int rc ){
   #ifdef PEGASUS_OS_OS400
       cimserver_exitRC(rc);
   #endif
       exit(rc);
   }
   
 void shutdownCIMOM(Uint32 timeoutValue) void shutdownCIMOM(Uint32 timeoutValue)
 { {
     //     //
Line 267 
Line 286 
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Unable to connect to CIM Server.  CIM Server may not be running." );                     "Unable to connect to CIM Server.  CIM Server may not be running." );
         // The server job may still be active but not responding.         // The server job may still be active but not responding.
         // Kill the job if it exists.         // Kill the job if it exists.
         cimserver_kill();          if(cimserver_kill() == -1)
         exit(1);             cimserver_exit(2);
           cimserver_exit(1);
 #else #else
         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);
         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);
 #endif #endif
         exit(0);          cimserver_exit(0);
     }     }
  
     try     try
Line 319 
Line 339 
  
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
             Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Failed to shutdown server: $0", "The repository may be empty.");                     "Failed to shutdown server: $0", "The repository may be empty.");
         }         }
         else         else
         {         {
             Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                         "Failed to shutdown server: $0", e.getMessage());                         "Failed to shutdown server: $0", e.getMessage());
         }         }
         // Kill the server job.         // Kill the server job.
         cimserver_kill();          if(cimserver_kill() == -1)
              cimserver_exit(2);
 #else #else
         PEGASUS_STD(cerr) << "Failed to shutdown server: ";         PEGASUS_STD(cerr) << "Failed to shutdown server: ";
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
Line 341 
Line 362 
             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         }         }
 #endif #endif
         exit(1);          cimserver_exit(1);
  
     }     }
     catch(Exception& e)     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         // Check to see if CIMServer is still running.  If CIMServer
         // is still running and the shutdown timeout has not expired,         // 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;         Uint32 maxWaitTime = timeoutValue - 2;
         Boolean running = isCIMServerRunning();         Boolean running = isCIMServerRunning();
Line 376 
Line 391 
  
         if (running)         if (running)
         {         {
             cimserver_kill();              int kill_rc = cimserver_kill();
   #ifdef PEGASUS_OS_OS400
               if(kill_rc == -1)
                   cimserver_exit(2);
               cimserver_exit(1);
   #endif
   
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
               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;     return;
 } }
Line 538 
Line 560 
                   //                   //
                   // Install as a NT service                   // Install as a NT service
                   //                   //
                   if(cimserver_install_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
   
                     }
                     if(cimserver_install_nt_service(opt_arg))
                   {                   {
                       cout << "\nPegasus installed as NT Service";                       cout << "\nPegasus installed as NT Service";
                       exit(0);                       exit(0);
Line 553 
Line 581 
                   //                   //
                   // Remove Pegasus as an NT service                   // Remove Pegasus as an NT service
                   //                   //
                   if(cimserver_remove_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_remove_nt_service(opt_arg))
                   {                   {
                       cout << "\nPegasus removed as NT Service";                       cout << "\nPegasus removed as NT Service";
                       exit(0);                       exit(0);
Line 569 
Line 602 
                   //                   //
                   // Start as a NT service                   // Start as a NT service
                   //                   //
                   if(cimserver_start_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_start_nt_service(opt_arg))
                   {                   {
                       cout << "\nPegasus started as NT Service";                       cout << "\nPegasus started as NT Service";
                       exit(0);                       exit(0);
Line 584 
Line 622 
                   //                   //
                   // Stop as a NT service                   // Stop as a NT service
                   //                   //
                   if(cimserver_stop_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_stop_nt_service(opt_arg))
                   {                   {
                       cout << "\nPegasus stopped as NT Service";                       cout << "\nPegasus stopped as NT Service";
                       exit(0);                       exit(0);
Line 625 
Line 668 
     catch (Exception& e)     catch (Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                         "$0: $1",argv[0] ,e.getMessage());                         "$0: $1",argv[0] ,e.getMessage());
 #else #else
         cerr << argv[0] << ": " << e.getMessage() << endl;         cerr << argv[0] << ": " << e.getMessage() << endl;
Line 642 
Line 685 
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
     if (!enableHttpConnection && !enableHttpsConnection)     if (!enableHttpConnection && !enableHttpsConnection)
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
             "Neither HTTP nor HTTPS connection is enabled.  "             "Neither HTTP nor HTTPS connection is enabled.  "
             "CIMServer will not be started.");             "CIMServer will not be started.");
         cerr << "Neither HTTP nor HTTPS connection is enabled.  "         cerr << "Neither HTTP nor HTTPS connection is enabled.  "
Line 692 
Line 735 
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
             Logger::put(Logger::ERROR_LOG, "", Logger::INFORMATION,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "CIM Server stopped.");                         "CIM Server stopped.");
 #else #else
             cout << "CIM Server stopped." << endl;             cout << "CIM Server stopped." << endl;
 #endif #endif
             exit(0);              cimserver_exit(0);
         }         }
  
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
Line 715 
Line 758 
     {     {
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Error: $0",e.getMessage());                     "Error: $0",e.getMessage());
 #else #else
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
Line 788 
Line 831 
     if (cimserver_initialize() != 0)     if (cimserver_initialize() != 0)
     {     {
         // do some logging here!         // do some logging here!
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "CIM Server failed to initialize");                     "CIM Server failed to initialize");
         exit(-1);         exit(-1);
     }     }
 #endif #endif
  
 #ifdef PEGASUS_OS_HPUX  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
     umask(S_IWGRP|S_IWOTH);     umask(S_IWGRP|S_IWOTH);
  
     //     //
Line 841 
Line 884 
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false);             server.addAcceptor(false, portNumberHttp, false);
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,              Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "Listening on HTTP port $0.", portNumberHttp);                         "Listening on HTTP port $0.", portNumberHttp);
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
             server.addAcceptor(false, portNumberHttps, true);             server.addAcceptor(false, portNumberHttps, true);
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,              Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "Listening on HTTPS port $0.", portNumberHttps);                         "Listening on HTTPS port $0.", portNumberHttps);
         }         }
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         server.addAcceptor(true, 0, false);         server.addAcceptor(true, 0, false);
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Listening on local connection socket.");                     "Listening on local connection socket.");
 #endif #endif
  
Line 880 
Line 923 
  
         time_t last = 0;         time_t last = 0;
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
         //         //
         // create a file to indicate that the cimserver has started and         // create a file to indicate that the cimserver has started and
         // save the process id of the cimserver process in the file         // save the process id of the cimserver process in the file
         //         //
   
         // remove the old file if it exists         // remove the old file if it exists
         System::removeFile(fname);          System::removeFile(CIMSERVER_START_FILE);
  
         // open the file         // open the file
         FILE *pid_file = fopen(fname, "w");          FILE *pid_file = fopen(CIMSERVER_START_FILE, "w");
   
         if (pid_file)         if (pid_file)
         {         {
             // save the pid in the file             // save the pid in the file
Line 898 
Line 941 
             fclose(pid_file);             fclose(pid_file);
         }         }
 #endif #endif
   
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \ #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
 !defined(PEGASUS_OS_OS400) !defined(PEGASUS_OS_OS400)
         cout << "Started. " << endl;         cout << "Started. " << endl;
Line 905 
Line 949 
  
         // Put server started message to the logger         // Put server started message to the logger
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PEGASUS_NAME, PEGASUS_VERSION);                     PEGASUS_NAME, PEGASUS_VERSION);
 #endif #endif
Line 946 
Line 990 
         //         //
         // Put server shutdown message to the logger         // Put server shutdown message to the logger
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
             "$0 stopped.", PLATFORM_PRODUCT_NAME);             "$0 stopped.", PLATFORM_PRODUCT_NAME);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
             "$0 stopped.", PEGASUS_NAME);             "$0 stopped.", PEGASUS_NAME);
 #endif #endif
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
         //         //
         // close the file created at startup time to indicate that the         // close the file created at startup time to indicate that the
         // cimserver has terminated normally.         // cimserver has terminated normally.
         //         //
         FileSystem::removeFile(CIMSERVERSTART_FILE);          FileSystem::removeFile(CIMSERVER_START_FILE);
 #endif #endif
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::STANDARD_LOG, "", Logger::WARNING,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                     "Error: $0", e.getMessage());                     "Error: $0", e.getMessage());
 #else #else
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);

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