(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.79 and 1.130

version 1.79, 2002/10/15 21:41:03 version 1.130, 2004/01/29 23:47:10
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2003////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
   // IBM Corp.; EMC Corporation, The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 36 
Line 38 
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
 //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com) //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)
 // //
   // Modified By: Dave Rosckes (rosckes@us.ibm.com)
   //
   // Modified By: Humberto Rivero (hurivero@us.ibm.com)
   //
   // Modified By: Steve Hills (steve.hills@ncr.com)
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 71 
Line 79 
 // To START the Pegasus service, // To START the Pegasus service,
 // //
 // net start cimserver // net start cimserver
   // or
   // cimserver -start
 // //
 // To STOP the Pegasus service, // To STOP the Pegasus service,
 // //
 // net stop cimserver // net stop cimserver
   // or
   // cimserver -stop
 // //
 // Alternatively, you can use the windows service manager. Pegasus shows up // Alternatively, you can use the windows service manager. Pegasus shows up
 // in the service database as "Pegasus CIM Object Manager" // in the service database as "Pegasus CIM Object Manager"
Line 101 
Line 113 
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
 #include <Pegasus/Common/Destroyer.h> #include <Pegasus/Common/Destroyer.h>
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)  
 #include <slp/slp.h>  
 #endif  
  
   PEGASUS_USING_PEGASUS;
   PEGASUS_USING_STD;
   
   int cimserver_run( int argc, char** argv, Boolean shutdownOption );
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # 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 "vfyptrs.cinc"
   #  include "OS400ConvertChar.h"
 #  include "cimserver_os400.cpp" #  include "cimserver_os400.cpp"
 # else # else
 #  include "cimserver_unix.cpp" #  include "cimserver_unix.cpp"
Line 118 
Line 133 
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
  
 PEGASUS_USING_PEGASUS;  
 PEGASUS_USING_STD;  
   
 // //
 //  The command name. //  The command name.
 // //
Line 147 
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;
  
   /** Helper for platform specific handling. So platform specific code
       can use our single instance of CIMServer.
   */
   class CimserverHolder
   {
   public:
           CimserverHolder( CIMServer* s )
           {
                   cimserver_set( s );
           }
           virtual ~CimserverHolder()
           {
                   cimserver_set( 0 );
           }
   };
   
 /** 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.
 */ */
 void GetOptions( void GetOptions(
     ConfigManager* cm,     ConfigManager* cm,
     int& argc,     int& argc,
     char** argv,      char** argv)
     const String& pegasusHome)  
 { {
     try     try
     {     {
Line 166 
Line 192 
  
         cm->mergeCommandLine(argc, argv);         cm->mergeCommandLine(argc, argv);
     }     }
     catch (NoSuchFile nsf)      catch (NoSuchFile&)
       {
           throw;
       }
       catch (FileNotReadable&)
     {     {
         throw nsf;          throw;
     }     }
     catch (FileNotReadable fnr)      catch (CannotRenameFile&)
     {     {
         throw fnr;          throw;
     }     }
     catch (CannotRenameFile ftrf)      catch (ConfigFileSyntaxError&)
     {     {
         throw ftrf;          throw;
     }     }
     catch (ConfigFileSyntaxError cfse)      catch(UnrecognizedConfigProperty&)
     {     {
         throw cfse;          throw;
     }     }
     catch(UnrecognizedConfigProperty ucp)      catch(InvalidPropertyValue&)
     {     {
         throw ucp;          throw;
     }     }
     catch(InvalidPropertyValue ipv)      catch (CannotOpenFile&)
     {     {
         throw ipv;          throw;
     }     }
 } }
  
Line 201 
Line 231 
     /**     /**
         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 208 
Line 239 
     usage.append ("    -v          - displays CIM Server version number\n");     usage.append ("    -v          - displays CIM Server version number\n");
     usage.append ("    -h          - prints this help message\n");     usage.append ("    -h          - prints this help message\n");
     usage.append ("    -s          - shuts down CIM Server\n");     usage.append ("    -s          - shuts down CIM Server\n");
 #ifndef PEGASUS_OS_HPUX  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
     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 ("                      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 #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");
  
     cout << endl;     cout << endl;
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
     cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;     cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;
 #else #else
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
 #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);
 } }
  
 void shutdownCIMOM(Uint32 timeoutValue) void shutdownCIMOM(Uint32 timeoutValue)
Line 252 
Line 352 
         //         //
         client.setTimeout(2000);         client.setTimeout(2000);
     }     }
     catch(Exception& e)      catch(Exception&)
     {     {
         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);  
         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
           //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." );
         // 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)
              cimserver_exitRC(2);
           cimserver_exitRC(1);
   #else
           //l10n
           //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);
           exit(1);
 #endif #endif
         exit(0);  
     }     }
  
     try     try
Line 299 
Line 412 
     }     }
     catch(CIMException& e)     catch(CIMException& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: ";  #ifdef PEGASUS_OS_OS400
   
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
             PEGASUS_STD(cerr) << "The repository may be empty.";              //l10n
             PEGASUS_STD(cerr) << PEGASUS_STD(endl);              //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
         {         {
             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);              //l10n
               //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());
         }         }
 #ifdef PEGASUS_OS_OS400  
         // Kill the server job.         // Kill the server job.
         cimserver_kill();          if(cimserver_kill() == -1)
 #endif             cimserver_exitRC(2);
         exit(1);  #else
     }          //l10n - TODO
     catch(Exception& e)          MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED",
                                    "Error in server shutdown: ");
           PEGASUS_STD(cerr) << MessageLoader::getMessage(parms);
           if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
     {     {
         //         //
         // This may mean the CIM Server has been terminated and returns a              // Repository may be empty.
         // "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);              //l10n - TODO
         //cimserver_kill();              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
           {
               //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);
           }
  
           // 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);
           }
           exit(1);
   #endif
       }
       catch(Exception&)
       {
           //
           // This may mean that the CIM Server has terminated, causing this
           // client to get a "Empty HTTP response message" exception.  It may
           // also mean that the CIM Server is taking longer than 2 seconds
           // (client timeout value) to terminate, causing this client to
           // timeout with a "connection timeout" exception.
         //         //
         // 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 347 
Line 502 
  
         if (running)         if (running)
         {         {
             cimserver_kill();             int kill_rc = cimserver_kill();
   
   #ifdef PEGASUS_OS_OS400
               if(kill_rc == -1)
                   cimserver_exitRC(2);
               cimserver_exitRC(1);
   #endif
   
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)
               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 367 
Line 536 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOLog = false;  
     String httpPort = String::EMPTY;  
     String httpsPort = String::EMPTY;  
     String logsDirectory = String::EMPTY;  
     Boolean useSLP = false;  
     Boolean useSSL = false;  
     Boolean daemonOption = false;  
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Uint32 timeoutValue  = 0;  
   //l10n
   // Set Message loading to process locale
   MessageLoader::_useProcessLocale = true;
   //l10n
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
   
     VFYPTRS_INCDCL;               // VFYPTRS local variables
   
     // verify pointers
     #pragma exception_handler (qsyvp_excp_hndlr,qsyvp_excp_comm_area,\
       0,_C2_MH_ESCAPE)
       for( int arg_index = 1; arg_index < argc; arg_index++ ){
           VFYPTRS(VERIFY_SPP_NULL(argv[arg_index]));
       }
     #pragma disable_handler
   
       // 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
  
   #ifndef PEGASUS_OS_TYPE_WINDOWS
     //     //
     // 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
  
     // on Windows NT if there are no command-line options, run as a service    // windows only
     setHome(pegasusHome);
   #endif
  
     if (argc == 1 )  
     {  
       cim_server_service(argc, argv);  
     }  
     else  
     {  
         // Get help, version, and shutdown options         // Get help, version, and shutdown options
  
         for (int i = 1; i < argc; )         for (int i = 1; i < argc; )
Line 417 
Line 611 
                 //                 //
                 // Check to see if user asked for the version (-v option):                 // Check to see if user asked for the version (-v option):
                 //                 //
                 if (*option == OPTION_VERSION)                  if (*option == OPTION_VERSION &&
                       strlen(option) == 1)
                 {                 {
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
                     cout << PLATFORM_PRODUCT_VERSION << endl;                     cout << PLATFORM_PRODUCT_VERSION << endl;
 #else #else
                     cout << PEGASUS_VERSION << endl;                     cout << PEGASUS_VERSION << endl;
Line 429 
Line 624 
                 //                 //
                 // Check to see if user asked for help (-h option):                 // Check to see if user asked for help (-h option):
                 //                 //
                 else if (*option == OPTION_HELP)                  else if (*option == OPTION_HELP &&
                           (strlen(option) == 1))
                 {                 {
                     PrintHelp(argv[0]);                     PrintHelp(argv[0]);
                     exit(0);                     exit(0);
                 }                 }
 #ifndef PEGASUS_OS_HPUX  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
                 else if (*option == OPTION_HOME)                  else if (*option == OPTION_HOME &&
                           (strlen(option) == 1))
                 {                 {
                     if (i + 1 < argc)                     if (i + 1 < argc)
                     {                     {
Line 443 
Line 640 
                     }                     }
                     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 455 
Line 658 
                 //                 //
                 // Check to see if user asked for the version (-X option):                 // Check to see if user asked for the version (-X option):
                 //                 //
                 if (*option == OPTION_BINDVERBOSE)                  if (*option == OPTION_BINDVERBOSE &&
                           (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 468 
Line 676 
                 //                 //
                 // Check to see if user asked for shutdown (-s option):                 // Check to see if user asked for shutdown (-s option):
                 //                 //
                 else if (*option == OPTION_SHUTDOWN)                  else if (*option == OPTION_SHUTDOWN &&
                           (strlen(option) == 1))
                 {                 {
                     //                     //
                     // check to see if user is root                     // check to see if user is root
                     //                     //
 #ifndef PEGASUS_OS_OS400  #if !defined(PEGASUS_OS_OS400) && !defined(PEGASUS_OS_ZOS)
                     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 487 
Line 701 
                     //                     //
                     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 503 
Line 722 
             else             else
                 i++;                 i++;
         }         }
     }  
  
     //     //
     // Set the value for pegasusHome property     // Set the value for pegasusHome property
Line 511 
Line 729 
     ConfigManager::setPegasusHome(pegasusHome);     ConfigManager::setPegasusHome(pegasusHome);
  
     //     //
       // Do the plaform specific run
       //
   
       return platform_run( argc, argv, shutdownOption );
   }
   
   
   //
   // The main, common, running code
   //
   // NOTE: Do NOT call exit().  Use return(), otherwise some platforms
   // will fail to shutdown properly/cleanly.
   //
   // TODO: Current change minimal for platform "service" shutdown bug fixes.
   // Perhpas further extract out common stuff and put into main(), put
   // daemon stuff into platform specific platform_run(), etc.
   // Note: make sure to not put error handling stuff that platform
   // specific runs may need to deal with bettter (instead of exit(), etc).
   //
   
   int cimserver_run( int argc, char** argv, Boolean shutdownOption )
   {
       String logsDirectory = String::EMPTY;
       Boolean daemonOption = false;
   
       //
     // Get an instance of the Config Manager.     // Get an instance of the Config Manager.
     //     //
     configManager = ConfigManager::getInstance();     configManager = ConfigManager::getInstance();
  
   #ifdef PEGASUS_OS_OS400
       // In a special startup case for IBM OS400, when the server is
       // automatically started when the machine starts up the config
       // file cannot be read because of access restrictions for the
       // user starting the server.  In this case, we need to skip
       // reading the config options and therefore any use of the config
       // manager also.  To make this determinations we will check to see
       // if the daemon flag is set to true.  If so, then there will be a
       // series of checks to bracket all the calls to the configManager
       // which would otherwise fail.  All this will only be done for
       // IBM OS400.
   
       Boolean os400StartupOption = false;
       // loop through args to check for daemon=true
       for (int i=1; i < argc; i++)
         if (strcmp(argv[i], "daemon=true") == 0)
         {
           os400StartupOption = true;
           daemonOption = true;
         }
   #endif
   
     //     //
     // Get options (from command line and from configuration file); this     // Get options (from command line and from configuration file); this
     // removes corresponding options and their arguments from the command     // removes corresponding options and their arguments from the command
Line 522 
Line 788 
     //     //
     try     try
     {     {
         GetOptions(configManager, argc, argv, pegasusHome);  #ifdef PEGASUS_OS_OS400
       if (os400StartupOption == false)
   #endif
           GetOptions(configManager, argc, argv);
     }     }
     catch (Exception& e)     catch (Exception& e)
     {     {
         cerr << argv[0] << ": " << e.getMessage() << endl;          Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
         exit(1);              "src.Server.cimserver.SERVER_NOT_STARTED",
     }              "cimserver not started:  $0", e.getMessage());
  
     try  #if !defined(PEGASUS_OS_OS400)
     {          MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",
         //              "cimserver not started: $0", e.getMessage());
         // Check to see if we should (can) install as a NT service  
         //  
  
         if (String::equal(configManager->getCurrentValue("install"), "true"))          PEGASUS_STD(cerr) << argv[0] << ": " << MessageLoader::getMessage(parms)
         {              << PEGASUS_STD(endl);
             if( 0 != cimserver_install_nt_service( pegasusHome ))  #endif
             {  
                 cout << "\nPegasus installed as NT Service";          return(1);
                 exit(0);  
             }  
         }         }
  
         //  // l10n
         // Check to see if we should (can) remove Pegasus as an NT service          // 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);
  
         if (String::equal(configManager->getCurrentValue("remove"), "true"))  #ifdef PEGASUS_OS_OS400
         {      // Still need to declare and set the connection variables.
             if( 0 != cimserver_remove_nt_service() )      // Will initialize to false since they are fixed at false for OS400.
   
       // NOTE:  OS400 is a LOCAL_DOMAIN_SOCKET, so a few lines down
       // the test will not be compiled in.  If OS400 ever turns off that
       // define, then we will need to change this code path to insure that
       // one of the variables is true.
       Boolean enableHttpConnection = false;
       Boolean enableHttpsConnection = false;
   
       if (os400StartupOption == false)
             {             {
                 cout << "\nPegasus removed as NT Service";        enableHttpConnection = String::equal(
                 exit(0);            configManager->getCurrentValue("enableHttpConnection"), "true");
         enableHttpsConnection = String::equal(
             configManager->getCurrentValue("enableHttpsConnection"), "true");
             }             }
   #else
       Boolean enableHttpConnection = String::equal(
           configManager->getCurrentValue("enableHttpConnection"), "true");
       Boolean enableHttpsConnection = String::equal(
           configManager->getCurrentValue("enableHttpsConnection"), "true");
   #endif
   
       // Make sure at least one connection is enabled
   #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
       if (!enableHttpConnection && !enableHttpsConnection)
       {
           //l10n
           //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               //"Neither HTTP nor HTTPS connection is enabled.  "
               //"CIMServer will not be started.");
           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;
           return(1);
         }         }
   #endif
  
       try
       {
         //         //
         // Check to see if we should Pegasus as a daemon         // Check to see if we should Pegasus as a daemon
         //         //
Line 567 
Line 878 
             daemonOption = true;             daemonOption = true;
         }         }
  
         //  #ifdef PEGASUS_OS_OS400
         // Check the log trace options and set global variable      if (os400StartupOption == false)
         //  
   
         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))  
         {         {
             pegasusIOLog = true;  #endif
         }  
   
         // Get the log file directory definition.         // Get the log file directory definition.
         // We put String into Cstring because         // We put String into Cstring because
         // Directory functions only handle Cstring.         // Directory functions only handle Cstring.
Line 584 
Line 890 
         logsDirectory = configManager->getCurrentValue("logdir");         logsDirectory = configManager->getCurrentValue("logdir");
         logsDirectory =         logsDirectory =
             ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));             ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));
   #ifdef PEGASUS_OS_OS400
       }  // end if (os400StartupOption == false)
   #endif
  
         // 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  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
   !defined(PEGASUS_OS_OS400)
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
 #endif #endif
  
Line 600 
Line 910 
         {         {
             String configTimeout =             String configTimeout =
                 configManager->getCurrentValue("shutdownTimeout");                 configManager->getCurrentValue("shutdownTimeout");
             timeoutValue = strtol(configTimeout.getCString(), (char **)0, 10);              Uint32 timeoutValue = strtol(configTimeout.getCString(), (char **)0, 10);
  
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
             cout << "CIM Server stopped." << endl;  #ifdef PEGASUS_OS_OS400
             exit(0);              //l10n
         }              //Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                           //"CIM Server stopped.");
         //                  Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
         // Get the port numbers                          "src.Server.cimserver.SERVER_STOPPED",
         //                          "CIM Server stopped.");
               cimserver_exitRC(0);
         httpPort = configManager->getCurrentValue("httpPort");  #else
                           //l10n
               //cout << "CIM Server stopped." << endl;
               MessageLoaderParms parms("src.Server.cimserver.SERVER_STOPPED",
                                                            "CIM Server stopped.");
  
         httpsPort = configManager->getCurrentValue("httpsPort");              cout << MessageLoader::getMessage(parms) << endl;
               return(0);
   #endif
           }
  
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
 #ifndef PEGASUS_OS_HPUX  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
         cout << "Logs Directory = " << logsDirectory << endl;  !defined(PEGASUS_OS_OS400)
           //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("cleanlogs"), "true"))  
         {  
             Logger::clean(logsDirectory);;  
         }  
  
         if (String::equal(configManager->getCurrentValue("slp"), "true"))  
         {  
             useSLP =  true;  
         }         }
       catch (UnrecognizedConfigProperty& e)
 #if defined(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)  
         Boolean enableHttpConnection = String::equal(  
             configManager->getCurrentValue("enableHttpConnection"), "true");  
         Boolean enableHttpsConnection = String::equal(  
             configManager->getCurrentValue("enableHttpsConnection"), "true");  
   
         if (enableHttpConnection && enableHttpsConnection)  
         {         {
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
                 "Enabling both HTTP and HTTPS connections is unsupported.  "  
                 "Only the HTTPS connection is enabled.");  
             cerr << "Enabling both HTTP and HTTPS connections is unsupported.  "  
                 "Only the HTTPS connection is enabled." << endl;  
         }  
         else if (!enableHttpConnection && !enableHttpsConnection)  
         {  
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
                 "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;  
             exit(1);  
         }  
   
         useSSL = enableHttpsConnection;  
  
   #ifdef PEGASUS_OS_OS400
           //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());
 #else #else
         if (String::equal(configManager->getCurrentValue("SSL"), "true"))          //l10n
         {          //cout << "Error: " << e.getMessage() << endl;
             useSSL =  true;          MessageLoaderParms parms("src.Server.cimserver.ERROR",
         }                                                           "Error: $0",
                                                            e.getMessage());
           cout << MessageLoader::getMessage(parms) << endl;
 #endif #endif
     }     }
     catch (UnrecognizedConfigProperty e)  
     {  
         cout << "Error: " << e.getMessage() << endl;  
     }  
   
     Uint32 portNumber;  
  
     char address[32];      Uint32 portNumberHttps;
       Uint32 portNumberHttp;
  
     if (useSSL)      if (enableHttpsConnection)
     {     {
         char* end = 0;          String httpsPort = configManager->getCurrentValue("httpsPort");
         CString portString = httpsPort.getCString();         CString portString = httpsPort.getCString();
           char* end = 0;
         Uint32 port = strtol(portString, &end, 10);         Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
  
         //         //
         // Look up the WBEM-HTTPS port number         // Look up the WBEM-HTTPS port number
         //         //
         portNumber = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);          portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);
         sprintf(address, "%u", portNumber);  
     }     }
     else  
       if (enableHttpConnection)
     {     {
         char* end = 0;          String httpPort = configManager->getCurrentValue("httpPort");
         CString portString = httpPort.getCString();         CString portString = httpPort.getCString();
           char* end = 0;
         Uint32 port = strtol(portString, &end, 10);         Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
  
         //         //
         // Look up the WBEM-HTTP port number         // Look up the WBEM-HTTP port number
         //         //
         portNumber = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);          portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);
         sprintf(address, "%u", portNumber);  
     }     }
  
     // Put out startup up message.     // Put out startup up message.
 #ifndef PEGASUS_OS_HPUX  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
     cout << PEGASUS_NAME << PEGASUS_VERSION <<  !defined(PEGASUS_OS_OS400)
          " on port " << address << endl;      cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;      //l10n
     cout <<"Starting..."      //cout << "Built " << __DATE__ << " " << __TIME__ << endl;
          << (pegasusIOLog ? " Tracing to Log ": " ")      //cout <<"Starting..."
          << (useSLP ? " SLP reg. " : " No SLP ")      MessageLoaderParms parms("src.Server.cimserver.STARTUP_MESSAGE",
          << (useSSL ? " Use SSL " : " No SSL ")                                                   "Built $0 $1\nStarting...",
         << endl;                                                   __DATE__,
                                                    __TIME__);
 #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)
     {     {
         if(-1 == cimserver_fork())         if(-1 == cimserver_fork())
           exit(-1);  #ifndef PEGASUS_OS_OS400
           {
               return(-1);
           }
   #else
           {
               return(-1);
           }
           else
           {
               return(0);
           }
   #endif
   
     }     }
  
   // 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!
        exit(-1);          //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");
           return(-1);
     }     }
 #endif #endif
  
 #ifdef PEGASUS_OS_HPUX  
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)
     umask(S_IWGRP|S_IWOTH);     umask(S_IWGRP|S_IWOTH);
  
     //     //
Line 738 
Line 1084 
     //     //
     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);          return(1);
     }     }
  
 #endif #endif
Line 755 
Line 1105 
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
     {     {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)  
         slp_client *discovery = new slp_client() ;;  
         String serviceURL;  
         serviceURL.assign("service:cim.pegasus://");  
         String host_name = slp_get_host_name();  
         serviceURL.append(host_name);  
         serviceURL.append(":");  
         serviceURL.append(address);  
 #endif  
  
   
   
   
   
   #if defined(PEGASUS_USE_23HTTPMONITOR)
         Monitor monitor(true);         Monitor monitor(true);
         CIMServer server(&monitor, useSSL);          CIMServer server(&monitor);
   #else
           monitor_2 monitor;
           CIMServer server(&monitor);
   #endif
  
         // bind throws an exception if the bind fails          CimserverHolder cimserverHolder( &server );
   
           if (enableHttpConnection)
           {
               server.addAcceptor(false, portNumberHttp, false);
               //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);
           }
           if (enableHttpsConnection)
           {
               server.addAcceptor(false, portNumberHttps, true);
               //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);
           }
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         cout << "Binding to domain socket" << endl;          server.addAcceptor(true, 0, false);
 #elif !defined(PEGASUS_OS_HPUX)          //l10n
         cout << "Binding to " << address << endl;          //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.");
   #endif
   
   #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400)
           if (enableHttpConnection)
           {
               //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)
           {
               //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
           //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
  
         server.bind(portNumber);          // bind throws an exception if the bind fails
           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) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)
         //         //
         // 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 802 
Line 1205 
             fclose(pid_file);             fclose(pid_file);
         }         }
 #endif #endif
 #ifndef PEGASUS_OS_HPUX  
   #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
   !defined(PEGASUS_OS_OS400)
         cout << "Started. " << endl;         cout << "Started. " << endl;
 #endif #endif
  
         // Put server started message to the logger         // Put server started message to the logger
 #ifdef PEGASUS_OS_HPUX  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          //l10n
                     "Started $0 version $1 on port $2.",          //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION, address);                      //"Started $0 version $1.",
 #else                      //PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Started $0 version $1 on port $2.",                                  "src.Server.cimserver.STARTED_VERSION",
                     PEGASUS_NAME, PEGASUS_VERSION, address);                      "Started $0 version $1.",
                       PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
   #else
                   //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.",
                       PEGASUS_NAME, PEGASUS_VERSION);
 #endif #endif
  
  
Line 824 
Line 1239 
         //         //
         while( !server.terminated() )         while( !server.terminated() )
         {         {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)  
           if(useSLP  )  
           {  
             if(  (time(NULL) - last ) > 60 )  
             {  
               if( discovery != NULL && serviceURL.size() )  
                 discovery->srv_reg_all(serviceURL.getCString(),  
                                        "(namespace=root/cimv2)",  
                                        "service:cim.pegasus",  
                                        "DEFAULT",  
                                        70) ;  
               time(&last);  
             }  
  
             discovery->service_listener();  
           }  
 #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
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
           //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);
   #else
                   //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
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)
         //         //
         // 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)
     {     {
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);  
           //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());
   
   #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
  
         //         //
         // 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;
     }     }
  
     return 0;     return 0;
 } }
   
   
   
   


Legend:
Removed from v.1.79  
changed lines
  Added in v.1.130

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2