(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.89 and 1.114

version 1.89, 2003/03/27 17:44:56 version 1.114, 2003/10/10 17:38:59
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 112 
Line 114 
 # include "cimserver_windows.cpp" # include "cimserver_windows.cpp"
 #elif defined(PEGASUS_OS_TYPE_UNIX) #elif defined(PEGASUS_OS_TYPE_UNIX)
 # if defined(PEGASUS_OS_OS400) # if defined(PEGASUS_OS_OS400)
   #  include "OS400ConvertChar.h"
 #  include "cimserver_os400.cpp" #  include "cimserver_os400.cpp"
 # else # else
 #  include "cimserver_unix.cpp" #  include "cimserver_unix.cpp"
Line 157 
Line 160 
 #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 211 
Line 213 
     /**     /**
         Build the usage string for the config command.         Build the usage string for the config command.
     */     */
       /* l10n
     String usage = String (USAGE);     String usage = String (USAGE);
     usage.append (COMMAND_NAME);     usage.append (COMMAND_NAME);
     usage.append (" [ [ options ] | [ configProperty=value, ... ] ]\n");     usage.append (" [ [ options ] | [ configProperty=value, ... ] ]\n");
Line 222 
Line 225 
     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 238 
Line 249 
 #endif #endif
     cout << endl;     cout << endl;
     cout << usage << endl;     cout << usage << endl;
       */
   
       String usage = String (USAGE);
       usage.append (COMMAND_NAME);
       usage.append (" [ [ options ] | [ configProperty=value, ... ] ]\n");
       usage.append ("  options\n");
       usage.append ("    -v              - displays CIM Server version number\n");
       usage.append ("    -h              - prints this help message\n");
       usage.append ("    -s              - shuts down CIM Server\n");
   #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
       //usage.append ("    -D [home]       - sets pegasus home directory\n");
       usage.append("$0");
   #endif
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
       usage.append ("    -install [name] - installs 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 ("    -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
       usage.append ("  configProperty=value\n");
       usage.append ("                    - sets CIM Server configuration property\n");
   
       cout << endl;
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
       cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;
   #else
       cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
   #endif
       cout << endl;
   
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
       MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS", usage);
   #elif defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
           MessageLoaderParms parms("src.Server.cimserver.MENU.HPUXLINUXIA64GNU", usage);
   #else
           MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD", usage);
   #endif
       //cout << usage << endl;
       cout << MessageLoader::getMessage(parms) << endl;
   }
   
   // l10n
   //
   // Dummy function for the Thread object associated with the initial thread.
   // Since the initial thread is used to process CIM requests, this is
   // needed to localize the exceptions thrown during CIM request processing.
   // Note: This function should never be called!
   //
   PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm)
   {
      return((PEGASUS_THREAD_RETURN)0);
   }
   
   //
   // 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 347 
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,          //l10n
           //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       //"Unable to connect to CIM Server.  CIM Server may not be running." );
           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "src.Server.cimserver.UNABLE_CONNECT_SERVER_MAY_NOT_BE_RUNNING",
                     "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);          //l10n
         PEGASUS_STD(cerr) << "CIM Server may not be running." << 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);
           MessageLoaderParms parms("src.Server.cimserver.UNABLE_CONNECT_SERVER_MAY_NOT_BE_RUNNING",
                                                            "Unable to connect to CIM Server.\nCIM Server may not be running.\n");
           PEGASUS_STD(cerr) << MessageLoader::getMessage(parms);
 #endif #endif
         exit(0);          cimserver_exit(1);
     }     }
  
     try     try
Line 319 
Line 408 
  
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
             Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,              //l10n
                     "Failed to shutdown server: $0", "The repository may be empty.");              //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       //"Failed to shutdown server: $0", "The repository may be empty.");
                   Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY",
                       "Error in server shutdown: The repository may be empty.");
         }         }
         else         else
         {         {
             Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,              //l10n
                         "Failed to shutdown server: $0", e.getMessage());              //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           //"Failed to shutdown server: $0", e.getMessage());
                   Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "src.Server.cimserver.SHUTDOWN_FAILED",
                           "Error in server shutdown: $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: ";          //l10n - TODO
           MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED",
                                    "Error in server shutdown: ");
           PEGASUS_STD(cerr) << MessageLoader::getMessage(parms);
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
             PEGASUS_STD(cerr) << "The repository may be empty.";              //
             PEGASUS_STD(cerr) << PEGASUS_STD(endl);              // Repository may be empty.
               //
               //l10n - TODO
               Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                   "src.Server.cimserver.SHUTDOWN_FAILED_REPOSITORY_EMPTY",
                   "Error in server shutdown: The repository may be empty.");
               MessageLoaderParms parms("src.Server.cimserver.REPOSITORY_EMPTY",
                                        "The repository may be empty.");
               PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
         }         }
         else         else
         {         {
               //l10n - TODO
               Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                   "src.Server.cimserver.SHUTDOWN_FAILED",
                   "Error in server shutdown: $0", e.getMessage());
             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         }         }
   
           // Kill the cimserver process
           if (cimserver_kill() == 0)
           {
               //l10n - TODO
               Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                   "src.Server.cimserver.SERVER_FORCED_SHUTDOWN",
                           "Forced shutdown initiated.");
               MessageLoaderParms parms("src.Server.cimserver.SERVER_FORCED_SHUTDOWN",
                                        "Forced shutdown initiated.");
               PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << 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 495 
  
         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)
               {
                   //l10n - TODO
                   Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",
                       "Shutdown timeout expired.  Forced shutdown initiated.");
                   MessageLoaderParms parms("src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",
                       "Shutdown timeout expired.  Forced shutdown initiated.");
                   cout << MessageLoader::getMessage(parms) << 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 402 
Line 535 
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Uint32 timeoutValue  = 0;     Uint32 timeoutValue  = 0;
  
   //l10n
   // Set Message loading to process locale
   MessageLoader::_useProcessLocale = true;
   //l10n
   
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
       // Convert the args to ASCII
       for(Uint32 i = 0;i< argc;++i)
       {
           EtoA(argv[i]);
       }
   
     // Initialize Pegasus home to the shipped OS/400 directory.     // Initialize Pegasus home to the shipped OS/400 directory.
     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;
 #endif #endif
Line 411 
Line 555 
     //     //
     // Get environment variables:     // Get environment variables:
     //     //
   #ifdef PEGASUS_OS_OS400
   #pragma convert(37)
       const char* tmp = getenv("PEGASUS_HOME");
   #pragma convert(0)
       char home[256] = {0};
       if (tmp && strlen(tmp) < 256)
       {
           strcpy(home, tmp);
           EtoA(home);
           pegasusHome = home;
       }
   #else
     const char* tmp = getenv("PEGASUS_HOME");     const char* tmp = getenv("PEGASUS_HOME");
  
     if (tmp)     if (tmp)
     {     {
         pegasusHome = tmp;         pegasusHome = tmp;
     }     }
   #endif
  
     FileSystem::translateSlashes(pegasusHome);     FileSystem::translateSlashes(pegasusHome);
 #else #else
Line 476 
Line 633 
                     }                     }
                     else                     else
                     {                     {
                         cout << "Missing argument for option -" << option << endl;                          //l10n
                           //cout << "Missing argument for option -" << option << endl;
                           String opt(option);
                           MessageLoaderParms parms("src.Server.cimserver.MISSING_ARGUMENT",
                                                                    "Missing argument for option -$0",
                                                                    opt);
                                   cout << MessageLoader::getMessage(parms) << endl;
                         exit(0);                         exit(0);
                     }                     }
  
Line 492 
Line 655 
                         (strlen(option) == 1))                         (strlen(option) == 1))
                 {                 {
                     System::bindVerbose = true;                     System::bindVerbose = true;
                     cout << "Unsupported debug option, BIND_VERBOSE, enabled."                      //l10n
                          << endl;                      //cout << "Unsupported debug option, BIND_VERBOSE, enabled."
                            //<< endl;
                       MessageLoaderParms parms("src.Server.cimserver.UNSUPPORTED_DEBUG_OPTION",
                                                                    "Unsupported debug option, BIND_VERBOSE, enabled.");
                           cout << MessageLoader::getMessage(parms) << endl;
                     // 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--;
Line 511 
Line 678 
 #ifndef PEGASUS_OS_OS400 #ifndef PEGASUS_OS_OS400
                     if (!System::isPrivilegedUser(System::getEffectiveUserName()))                     if (!System::isPrivilegedUser(System::getEffectiveUserName()))
                     {                     {
                         cout << "You must have superuser privilege to run ";                          //l10n
                         cout << "cimserver." << endl;                          //cout << "You must have superuser privilege to run ";
                           //cout << "cimserver." << endl;
                           MessageLoaderParms parms("src.Server.cimserver.SUPERVISOR_PRIVILEGE_TO_RUN_SERVER",
                                                                            "You must have superuser privilege to run cimserver.");
   
                           cout << MessageLoader::getMessage(parms) << endl;
                         exit(0);                         exit(0);
                     }                     }
 #endif #endif
Line 522 
Line 694 
                     //                     //
                     if (shutdownOption)                     if (shutdownOption)
                     {                     {
                         cout << "Duplicate shutdown option specified." << endl;                          //l10n
                           //cout << "Duplicate shutdown option specified." << endl;
                           MessageLoaderParms parms("src.Server.cimserver.DUPLICATE_SHUTDOWN_OPTION",
                                                                            "Duplicate shutdown option specified.");
   
                           cout << MessageLoader::getMessage(parms) << endl;
                         exit(0);                         exit(0);
                     }                     }
  
Line 538 
Line 715 
                   //                   //
                   // Install as a NT service                   // Install as a NT service
                   //                   //
                   if(cimserver_install_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                   {                   {
                       cout << "\nPegasus installed as NT Service";                      opt_arg = argv[i+1];
   
                     }
                     if(cimserver_install_nt_service(opt_arg))
                     {
                        //l10n
                         //cout << "\nPegasus installed as NT Service";
                         MessageLoaderParms parms("src.Server.cimserver.INSTALLED_NT_SERVICE",
                                                  "\nPegasus installed as NT Service");
   
                         cout << MessageLoader::getMessage(parms) << endl;
                       exit(0);                       exit(0);
                   }                   }
                   else                   else
Line 553 
Line 741 
                   //                   //
                   // 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)
                   {                   {
                       cout << "\nPegasus removed as NT Service";                      opt_arg = argv[i+1];
                     }
                     if(cimserver_remove_nt_service(opt_arg))
                     {
                         //l10n
                         //cout << "\nPegasus removed as NT Service";
                         MessageLoaderParms parms("src.Server.cimserver.REMOVED_NT_SERVICE",
                                                  "\nPegasus removed as NT Service");
   
                         cout << MessageLoader::getMessage(parms) << endl;
                       exit(0);                       exit(0);
                   }                   }
                   else                   else
Line 569 
Line 767 
                   //                   //
                   // Start as a NT service                   // Start as a NT service
                   //                   //
                   if(cimserver_start_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                   {                   {
                       cout << "\nPegasus started as NT Service";                      opt_arg = argv[i+1];
                     }
                     if(cimserver_start_nt_service(opt_arg))
                     {
                         //l10n
                         //cout << "\nPegasus started as NT Service";
                         MessageLoaderParms parms("src.Server.cimserver.STARTED_NT_SERVICE",
                                                  "\nPegasus started as NT Service");
   
                         cout << MessageLoader::getMessage(parms) << endl;
                       exit(0);                       exit(0);
                   }                   }
                   else                   else
Line 584 
Line 792 
                   //                   //
                   // Stop as a NT service                   // Stop as a NT service
                   //                   //
                   if(cimserver_stop_nt_service())                    char *opt_arg = NULL;
                     if (i+1 < argc)
                   {                   {
                       cout << "\nPegasus stopped as NT Service";                      opt_arg = argv[i+1];
                     }
                     if(cimserver_stop_nt_service(opt_arg))
                     {
                         //l10n
                         //cout << "\nPegasus stopped as NT Service";
                         MessageLoaderParms parms("src.Server.cimserver.STOPPED_NT_SERVICE",
                                                  "\nPegasus stopped as NT Service");
   
                         cout << MessageLoader::getMessage(parms) << endl;
                       exit(0);                       exit(0);
                   }                   }
                   else                   else
Line 633 
Line 851 
         exit(1);         exit(1);
     }     }
  
   // l10n
           // Set the home directory, msg sub-dir, into the MessageLoader.
           // This will be the default directory where the resource bundles
           // are found.
           String messagesDir = String::EMPTY;
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
           messagesDir = OS400_DEFAULT_MESSAGE_SOURCE;
   #else
           messagesDir = ConfigManager::getHomedPath("msg");
   #endif
           MessageLoader::setPegasusMsgHome(messagesDir);
   
     Boolean enableHttpConnection = String::equal(     Boolean enableHttpConnection = String::equal(
         configManager->getCurrentValue("enableHttpConnection"), "true");         configManager->getCurrentValue("enableHttpConnection"), "true");
     Boolean enableHttpsConnection = String::equal(     Boolean enableHttpsConnection = String::equal(
Line 642 
Line 872 
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
     if (!enableHttpConnection && !enableHttpsConnection)     if (!enableHttpConnection && !enableHttpsConnection)
     {     {
         Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,          //l10n
             "Neither HTTP nor HTTPS connection is enabled.  "          //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
             "CIMServer will not be started.");              //"Neither HTTP nor HTTPS connection is enabled.  "
         cerr << "Neither HTTP nor HTTPS connection is enabled.  "              //"CIMServer will not be started.");
             "CIMServer will not be started." << endl;          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                   "src.Server.cimserver.HTTP_NOT_ENABLED_SERVER_NOT_STARTING",
               "Neither HTTP nor HTTPS connection is enabled.  CIMServer will not be started.");
           //cerr << "Neither HTTP nor HTTPS connection is enabled.  "
               //"CIMServer will not be started." << endl;
           MessageLoaderParms parms("src.Server.cimserver.HTTP_NOT_ENABLED_SERVER_NOT_STARTING",
                                                            "Neither HTTP nor HTTPS connection is enabled.  CIMServer will not be started.");
           cerr << MessageLoader::getMessage(parms) << endl;
         exit(1);         exit(1);
     }     }
 #endif #endif
Line 692 
Line 929 
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
             Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,              //l10n
               //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                           //"CIM Server stopped.");
                   Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                           "src.Server.cimserver.SERVER_STOPPED",
                         "CIM Server stopped.");                         "CIM Server stopped.");
 #else #else
             cout << "CIM Server stopped." << endl;                          //l10n
               //cout << "CIM Server stopped." << endl;
               MessageLoaderParms parms("src.Server.cimserver.SERVER_STOPPED",
                                                            "CIM Server stopped.");
   
               cout << MessageLoader::getMessage(parms) << 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.
 #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 << "Logs Directory = " << logsDirectory << endl;          //l10n
           //cout << "Logs Directory = " << logsDirectory << endl;
           MessageLoaderParms parms("src.Server.cimserver.LOGS_DIRECTORY",
                                                "Logs Directory = ");
           cout << MessageLoader::getMessage(parms) << logsDirectory << endl;
 #endif #endif
  
         if (String::equal(configManager->getCurrentValue("slp"), "true"))         if (String::equal(configManager->getCurrentValue("slp"), "true"))
Line 715 
Line 965 
     {     {
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,          //l10n
           //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       //"Error: $0",e.getMessage());
           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "src.Server.cimserver.ERROR",
                     "Error: $0",e.getMessage());                     "Error: $0",e.getMessage());
 #else #else
         cout << "Error: " << e.getMessage() << endl;          //l10n
           //cout << "Error: " << e.getMessage() << endl;
           MessageLoaderParms parms("src.Server.cimserver.ERROR",
                                                            "Error: $0",
                                                            e.getMessage());
           cout << MessageLoader::getMessage(parms) << endl;
 #endif #endif
     }     }
  
Line 757 
Line 1016 
 #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 << PEGASUS_NAME << PEGASUS_VERSION << endl;     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;      //l10n
     cout <<"Starting..."      //cout << "Built " << __DATE__ << " " << __TIME__ << endl;
       //cout <<"Starting..."
       MessageLoaderParms parms("src.Server.cimserver.STARTUP_MESSAGE",
                                                    "Built $0 $1\nStarting...",
                                                    __DATE__,
                                                    __TIME__);
       cout << MessageLoader::getMessage(parms)
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
         << endl;         << endl;
 #endif #endif
  
   //l10n
   // reset message loading to NON-process locale
   MessageLoader::_useProcessLocale = false;
   //l10n
   
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
     {     {
Line 783 
Line 1053 
  
     }     }
  
   // l10n
       // Now we are after the fork...
       // Create a dummy Thread object that can be used to store the
       // AcceptLanguages object for CIM requests that are serviced
       // by this thread (initial thread of server).  Need to do this
       // because this thread is not in a ThreadPool, but is used
       // to service CIM requests.
       // The run function for the dummy Thread should never be called,
       Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);
       Thread::setCurrent(dummyInitialThread);
       AcceptLanguages default_al;
       try{
            default_al = AcceptLanguages::getDefaultAcceptLanguages();
            Thread::setLanguages(new AcceptLanguages(default_al));
       }catch(InvalidAcceptLanguageHeader e){
             Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                     "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",
                             "Could not convert the system process locale into a valid AcceptLanguage format.");
                     Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                                    e.getMessage());
       }
   
   
   
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
     // Special server initialization code for OS/400.     // Special server initialization code for OS/400.
     if (cimserver_initialize() != 0)     if (cimserver_initialize() != 0)
     {     {
         // do some logging here!         // do some logging here!
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,          //l10n
           //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       //"CIM Server failed to initialize");
           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                     "src.Server.cimserver.SERVER_FAILED_TO_INITIALIZE",
                     "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 804 
Line 1103 
     //     //
     if(isCIMServerRunning())     if(isCIMServerRunning())
     {     {
         cout << "Unable to start CIMServer." << endl;          //l10n
         cout << "CIMServer is already running." << endl;                  //cout << "Unable to start CIMServer." << endl;
                   //cout << "CIMServer is already running." << endl;
                   MessageLoaderParms parms("src.Server.cimserver.UNABLE_TO_START_SERVER_ALREADY_RUNNING",
                                            "Unable to start CIMServer.\nCIMServer is already running.");
           PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
  
         //         //
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         //         //
         if (daemonOption)         if (daemonOption)
                 notify_parent();                  notify_parent(1);
  
         exit(1);         exit(1);
     }     }
Line 835 
Line 1138 
         serviceURL.append(slp_address);         serviceURL.append(slp_address);
 #endif #endif
  
   
   
   
   #if defined(PEGASUS_OS_OS400) || defined(PEGASUS_MONITOR2)
           monitor_2 monitor;
           CIMServer server(&monitor);
   #else
   
         Monitor monitor(true);         Monitor monitor(true);
         CIMServer server(&monitor);         CIMServer server(&monitor);
   #endif
   
  
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false);             server.addAcceptor(false, portNumberHttp, false);
             Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,              //l10n
               //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                           //"Listening on HTTP port $0.", portNumberHttp);
   
               Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                                           "src.Server.cimserver.LISTENING_ON_HTTP_PORT",
                         "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, System::CIMSERVER, Logger::INFORMATION,              //l10n
               //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                           //"Listening on HTTPS port $0.", portNumberHttps);
               Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                                           "src.Server.cimserver.LISTENING_ON_HTTPS_PORT",
                         "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, System::CIMSERVER, Logger::INFORMATION,          //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                       //"Listening on local connection socket.");
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "src.Server.cimserver.LISTENING_ON_LOCAL",
                     "Listening on local connection socket.");                     "Listening on local connection socket.");
 #endif #endif
  
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400) #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400)
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             cout << "Listening on HTTP port " << portNumberHttp << endl;              //l10n
               //cout << "Listening on HTTP port " << portNumberHttp << endl;
             MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_HTTP_PORT",
                                      "Listening on HTTP port $0.", portNumberHttp);
                   cout << MessageLoader::getMessage(parms) << endl;
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
             cout << "Listening on HTTPS port " << portNumberHttps << endl;              //l10n
               //cout << "Listening on HTTPS port " << portNumberHttps << endl;
               MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_HTTPS_PORT",
                                        "Listening on HTTPS port $0.", portNumberHttps);
                   cout << MessageLoader::getMessage(parms) << endl;
         }         }
 # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         cout << "Listening on local connection socket" << endl;          //l10n
           //cout << "Listening on local connection socket" << endl;
           MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_LOCAL",
                                    "Listening on local connection socket.");
           cout << MessageLoader::getMessage(parms) << endl;
 # endif # endif
 #endif #endif
  
Line 874 
Line 1212 
         server.bind();         server.bind();
  
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         // so user knows that cimserver is ready to serve CIM requests.          // so user knows that there is cimserver ready to serve CIM requests.
         if (daemonOption)         if (daemonOption)
                 notify_parent();                  notify_parent(0);
  
         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 1236 
             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 1244 
  
         // 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, System::CIMSERVER, Logger::INFORMATION,          //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                       //"Started $0 version $1.",
                       //PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                                   "src.Server.cimserver.STARTED_VERSION",
                     "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, System::CIMSERVER, Logger::INFORMATION,                  //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                       //"Started $0 version $1.",
                       //PEGASUS_NAME, PEGASUS_VERSION);
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                                   "src.Server.cimserver.STARTED_VERSION",
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PEGASUS_NAME, PEGASUS_VERSION);                     PEGASUS_NAME, PEGASUS_VERSION);
 #endif #endif
Line 939 
Line 1288 
           }           }
 #endif #endif
           server.runForever();           server.runForever();
         }  
  
           }
           MessageQueueService::force_shutdown(true);
         //         //
         // normal termination         // normal termination
         //         //
         // 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, System::CIMSERVER, Logger::INFORMATION,          //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
               //"$0 stopped.", PLATFORM_PRODUCT_NAME);
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                   "src.Server.cimserver.STOPPED",
             "$0 stopped.", PLATFORM_PRODUCT_NAME);             "$0 stopped.", PLATFORM_PRODUCT_NAME);
 #else #else
         Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,                  //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
               //"$0 stopped.", PEGASUS_NAME);
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                   "src.Server.cimserver.STOPPED",
             "$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  
         Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,          //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                       //"Error: $0", e.getMessage());
           Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                           "src.Server.cimserver.ERROR",
                     "Error: $0", e.getMessage());                     "Error: $0", e.getMessage());
 #else  
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);  #ifndef PEGASUS_OS_OS400
           //l10n
           //PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
           MessageLoaderParms parms("src.Server.cimserver.ERROR",
                                                            "Error: $0", e.getMessage());
           PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
   
 #endif #endif
  
         //         //
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         //         //
         if (daemonOption)         if (daemonOption)
                 notify_parent();                  notify_parent(1);
  
         return 1;         return 1;
     }     }


Legend:
Removed from v.1.89  
changed lines
  Added in v.1.114

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2