(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.116 and 1.204

version 1.116, 2003/10/15 19:29:59 version 1.204, 2007/06/22 17:45:52
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // 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.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec 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 21 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Mike Brasher (mbrasher@bmc.com)  
 //  
 // Modified By: Mike Day (mdday@us.ibm.com)  
 //  
 // Modified By: Karl Schopmeyer (k.schopmeyer@opengroup.org)  
 //  
 // Modified By: Nag Boranna (nagaraja_boranna@hp.com)  
 //  
 // Modified By: Jenny Yu (jenny_yu@hp.com)  
 //  
 // Modified By: Sushma Fernandes (sushma_fernandes@hp.com)  
 //              Carol Ann Krug Graves, Hewlett-Packard Company  
 //                (carolann_graves@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)  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
 ////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
 // //
 // Notes on deamon operation (Unix) and service operation (Win 32):  // Notes on daemon operation (Unix) and service operation (Win 32):
 // //
 // To run pegasus as a daemon on Unix platforms: // To run pegasus as a daemon on Unix platforms:
 // //
Line 75 
Line 64 
 // 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"
 // //
 // Mike Day, mdday@us.ibm.com  
 //  
 ////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
  
  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/Constants.h> #include <Pegasus/Common/Constants.h>
 #include <iostream>  #include <Pegasus/Common/PegasusAssert.h>
 #include <cassert>  
 #include <cstdlib>  
 #include <fstream>  
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/Monitor.h>  
 #include <Pegasus/Server/CIMServer.h>  
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
   #include <Pegasus/Common/LanguageParser.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h>  #include <Pegasus/Server/CIMServer.h>
 #include <Pegasus/Common/Destroyer.h>  #include <Service/ServerProcess.h>
   #include <Service/ServerShutdownClient.h>
   #include <Service/ServerRunStatus.h>
  
   #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
   #include <Service/ARM_zOS.h>
   # ifdef PEGASUS_ZOS_SECURITY
   // This include file will not be provided in the OpenGroup CVS for now.
   // Do NOT try to include it in your compile
   #  include <Pegasus/Common/safCheckzOS_inline.h>
   # endif
   #endif
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS)  #if defined(PEGASUS_OS_TYPE_UNIX)
 # include "cimserver_windows.cpp"  # include <unistd.h>
 #elif defined(PEGASUS_OS_TYPE_UNIX)  # include <sys/types.h>
 # if defined(PEGASUS_OS_OS400)  # include <sys/stat.h>
 #  include "OS400ConvertChar.h"  # include <fcntl.h>
 #  include "cimserver_os400.cpp"  
 # else  
 #  include "cimserver_unix.cpp"  
 #endif #endif
   
   #ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
   # define PEGASUS_PROCESS_NAME "cimservermain"
 #else #else
 # error "Unsupported platform"  # define PEGASUS_PROCESS_NAME "cimserver"
 #endif #endif
  
   #include <Pegasus/Common/Executor.h>
   
 PEGASUS_USING_PEGASUS; PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
   //Windows service variables are not defined elsewhere in the product
   //enable ability to override these
   #ifndef PEGASUS_SERVICE_NAME
   #define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";
   #endif
   #ifndef PEGASUS_SERVICE_DESCRIPTION
   #define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";
   #endif
   
   class CIMServerProcess : public ServerProcess
   {
   public:
   
       CIMServerProcess()
       {
           cimserver_set_process(this);
       }
   
       virtual ~CIMServerProcess()
       {
       }
   
       //defined in PegasusVersion.h
       virtual const char* getProductName() const
       {
           return PEGASUS_PRODUCT_NAME;
       }
   
       virtual const char* getExtendedName() const
       {
           return PEGASUS_SERVICE_NAME;
       }
   
       virtual const char* getDescription() const
       {
           return PEGASUS_SERVICE_DESCRIPTION;
       }
   
       //defined in PegasusVersion.h
       virtual const char* getCompleteVersion() const
       {
         if (*PEGASUS_PRODUCT_STATUS == '\0' )
           return PEGASUS_PRODUCT_VERSION;
         else
           return PEGASUS_PRODUCT_VERSION " " PEGASUS_PRODUCT_STATUS;
       }
   
       //defined in PegasusVersion.h
       virtual const char* getVersion() const
       {
           return PEGASUS_PRODUCT_VERSION;
       }
   
       virtual const char* getProcessName() const
       {
           return PEGASUS_PROCESS_NAME;
       }
   
       int cimserver_run(
           int argc,
           char** argv,
           Boolean shutdownOption,
           Boolean debugOutputOption);
   
       void cimserver_stop();
   };
   
   ServerRunStatus _serverRunStatus(
       PEGASUS_PROCESS_NAME, PEGASUS_CIMSERVER_START_FILE);
   AutoPtr<CIMServerProcess> _cimServerProcess(new CIMServerProcess());
   static CIMServer* _cimServer = 0;
   static Thread* dummyInitialThread = 0;
   
 // //
 //  The command name. //  The command name.
 // //
Line 144 
Line 216 
  
 static const char OPTION_SHUTDOWN    = 's'; static const char OPTION_SHUTDOWN    = 's';
  
 static const char OPTION_INSTALL[]   = "install";  static const char LONG_HELP[]        = "help";
   
 static const char OPTION_REMOVE[]   = "remove";  
   
 static const char OPTION_START[]   = "start";  
   
 static const char OPTION_STOP[]   = "stop";  
   
 #if defined(PEGASUS_OS_HPUX)  
 static const char OPTION_BINDVERBOSE = 'X';  
 #endif  
  
 static const String PROPERTY_TIMEOUT = "shutdownTimeout";  static const char LONG_VERSION[]     = "version";
  
 ConfigManager*    configManager;  static const char OPTION_DEBUGOUTPUT = 'X';
  
 /** 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.
   
       Some possible exceptions:  NoSuchFile, FileNotReadable, CannotRenameFile,
       ConfigFileSyntaxError, UnrecognizedConfigProperty, InvalidPropertyValue,
       CannotOpenFile.
 */ */
 void GetOptions( void GetOptions(
     ConfigManager* cm,     ConfigManager* cm,
     int& argc,     int& argc,
     char** argv,     char** argv,
     const String& pegasusHome)      Boolean shutdownOption)
 {  
     try  
     {  
         cm->mergeConfigFiles();  
   
         cm->mergeCommandLine(argc, argv);  
     }  
     catch (NoSuchFile nsf)  
     {  
         throw nsf;  
     }  
     catch (FileNotReadable fnr)  
     {  
         throw fnr;  
     }  
     catch (CannotRenameFile ftrf)  
     {  
         throw ftrf;  
     }  
     catch (ConfigFileSyntaxError cfse)  
     {     {
         throw cfse;      if (shutdownOption)
     }  
     catch(UnrecognizedConfigProperty ucp)  
     {     {
         throw ucp;          cm->loadConfigFiles();
     }     }
     catch(InvalidPropertyValue ipv)      else
     {     {
         throw ipv;          cm->mergeConfigFiles();
     }     }
   
       // Temporarily disable updates to the current configuration
       // file if shutdownOption is true
       cm->useConfigFiles = (shutdownOption==false);
   
       cm->mergeCommandLine(argc, argv);
   
       // Enable updates again
       cm->useConfigFiles = true;
 } }
  
 /* PrintHelp - This is temporary until we expand the options manager to allow /* PrintHelp - This is temporary until we expand the options manager to allow
Line 207 
Line 260 
 */ */
 void PrintHelp(const char* arg0) void PrintHelp(const char* arg0)
 { {
     /**  
         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");
     usage.append ("  options\n");     usage.append ("  options\n");
     usage.append ("    -v              - displays CIM Server version number\n");      usage.append("    -v, --version   - displays CIM Server version number\n");
     usage.append ("    -h              - prints this help message\n");      usage.append("    -h, --help      - prints this help message\n");
     usage.append ("    -s              - shuts down CIM Server\n");     usage.append ("    -s              - shuts down CIM Server\n");
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  #if !defined(PEGASUS_USE_RELEASE_DIRS)
     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 [name] - installs pegasus as a Windows NT Service\n");      usage.append("    -install [name] - installs pegasus as a Windows "
     usage.append ("                      [name] is optional and overrides the\n");          "Service\n");
     usage.append ("                      default CIM Server Service Name\n");      usage.append("                      [name] is optional and overrides "
     usage.append ("    -remove [name]  - removes pegasus as a Windows NT Service\n");          "the\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 ("                      default CIM Server Service Name\n");
     usage.append ("    -stop [name]    - stops pegasus as a Windows NT Service\n");      usage.append("                      by appending [name]\n");
     usage.append ("                      [name] is optional and overrides the\n");      usage.append("    -remove [name]  - removes pegasus as a Windows "
     usage.append ("                      default CIM Server Service Name\n\n");          "Service\n");
 #endif      usage.append("                      [name] is optional and overrides "
     usage.append ("  configProperty=value\n");          "the\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;  
     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 ("                      default CIM Server Service Name\n");
     usage.append ("    -remove [name]  - removes pegasus as a Windows NT Service\n");      usage.append("                      by appending [name]\n");
     usage.append ("                      [name] is optional and overrides the\n");      usage.append("    -start [name]   - starts pegasus as a Windows Service\n");
       usage.append("                      [name] is optional and overrides "
           "the\n");
     usage.append ("                      default CIM Server Service Name\n");     usage.append ("                      default CIM Server Service Name\n");
     usage.append ("    -start [name]   - starts pegasus as a Windows NT Service\n");      usage.append("                      by appending [name]\n");
     usage.append ("                      [name] is optional and overrides the\n");      usage.append("    -stop [name]    - stops pegasus as a Windows Service\n");
       usage.append("                      [name] is optional and overrides "
           "the\n");
     usage.append ("                      default CIM Server Service Name\n");     usage.append ("                      default CIM Server Service Name\n");
     usage.append ("    -stop [name]    - stops pegasus as a Windows NT Service\n");      usage.append("                      by appending [name]\n\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) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)      cout << _cimServerProcess->getProductName() << " " <<
     cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;          _cimServerProcess->getCompleteVersion() << endl;
 #else  
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;  
 #endif  
     cout << endl;     cout << endl;
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS", usage);     MessageLoaderParms parms("src.Server.cimserver.MENU.WINDOWS", usage);
 #elif defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  #elif defined(PEGASUS_USE_RELEASE_DIRS)
         MessageLoaderParms parms("src.Server.cimserver.MENU.HPUXLINUXIA64GNU", usage);      MessageLoaderParms parms(
           "src.Server.cimserver.MENU.HPUXLINUXIA64GNU",
           usage);
 #else #else
         MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD", usage);         MessageLoaderParms parms("src.Server.cimserver.MENU.STANDARD", usage);
 #endif #endif
     //cout << usage << endl;  
     cout << MessageLoader::getMessage(parms) << endl;     cout << MessageLoader::getMessage(parms) << endl;
 } }
  
 // l10n  // This needs to be called at various points in the code depending on the
   // platform and error conditions.
   // We need to delete the _cimServer reference on exit in order for the
   // destructors to get called.
   void deleteCIMServer()
   {
       delete _cimServer;
       _cimServer = 0;
   
       if (dummyInitialThread)
       {
           Thread::clearLanguages();
           delete dummyInitialThread;
       }
   }
   
 // //
 // Dummy function for the Thread object associated with the initial thread. // Dummy function for the Thread object associated with the initial thread.
 // Since the initial thread is used to process CIM requests, this is // Since the initial thread is used to process CIM requests, this is
 // needed to localize the exceptions thrown during CIM request processing. // needed to localize the exceptions thrown during CIM request processing.
 // Note: This function should never be called! // Note: This function should never be called!
 // //
 PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL dummyThreadFunc(void *parm)  ThreadReturnType PEGASUS_THREAD_CDECL dummyThreadFunc(void* parm)
 { {
    return((PEGASUS_THREAD_RETURN)0);      return (ThreadReturnType)0;
 } }
  
 //  #ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
 // 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)  static int _extractExecutorSockOpt(int& argc, char**& argv)
 { {
     //      // Extract the "--executor-socket <sock>" option if any. This indicates
     // Create CIMClient object      // that the e[x]ecutor is running. The option argument is the socket used
     //      // to communicate with the executor. Remove the option from the
     CIMClient client;      // argv list and decrease argc by two.
  
     //      int sock = -1;
     // Get local host name      const char OPT[] = "--executor-socket";
     //  
     String hostStr = System::getHostName();  
  
     //      for (int i = 1; i < argc; i++)
     // open connection to CIMOM  
     //  
     try  
     {     {
         client.connectLocal();          if (strcmp(argv[i], OPT) == 0)
   
         //  
         // set client timeout to 2 seconds  
         //  
         client.setTimeout(2000);  
     }  
     catch(Exception& e)  
     {     {
 #ifdef PEGASUS_OS_OS400              // Check for missing option argument.
         //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.  
         // Kill the job if it exists.  
         if(cimserver_kill() == -1)  
            cimserver_exit(2);  
         cimserver_exit(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);  
 #endif  
         cimserver_exit(1);  
     }  
  
     try              if (i + 1 == argc)
     {     {
         //                  MessageLoaderParms parms(
         // construct CIMObjectPath                      "src.Server.cimserver.MISSING_OPTION_ARGUMENT",
         //                      "Missing argument for $0 option.",
         String referenceStr = "//";                      OPT);
         referenceStr.append(hostStr);                  cerr << argv[0] << ": " << MessageLoader::getMessage(parms) <<
         referenceStr.append("/");                      endl;
         referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN.getString());                  exit(1);
         referenceStr.append(":");              }
         referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN.getString());  
         CIMObjectPath reference(referenceStr);  
   
         //  
         // issue the invokeMethod request on the shutdown method  
         //  
         Array<CIMParamValue> inParams;  
         Array<CIMParamValue> outParams;  
  
         // set force option to true for now              // Convert argument to positive integer.
         inParams.append(CIMParamValue("force",  
             CIMValue(Boolean(true))));  
  
         inParams.append(CIMParamValue("timeout",              char* end;
             CIMValue(Uint32(timeoutValue))));              unsigned long x = strtoul(argv[i+1], &end, 10);
  
         CIMValue retValue = client.invokeMethod(              // Check whether option argument will fit in a signed integer.
             PEGASUS_NAMESPACENAME_SHUTDOWN,  
             reference,  
             "shutdown",  
             inParams,  
             outParams);  
     }  
     catch(CIMException& e)  
     {  
 #ifdef PEGASUS_OS_OS400  
  
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)              if (*end != '\0' || x > 2147483647)
         {  
             //l10n  
             //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  
         {  
             //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());  
         }  
         // Kill the server job.  
         if(cimserver_kill() == -1)  
            cimserver_exit(2);  
 #else  
         //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)  
         {  
             //  
             // 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  
         {         {
             //l10n - TODO                  MessageLoaderParms parms(
             Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,                      "src.Server.cimserver.BAD_OPTION_ARGUMENT",
                 "src.Server.cimserver.SHUTDOWN_FAILED",                      "Bad $0 option argument: $1.",
                 "Error in server shutdown: $0", e.getMessage());                      OPT,
             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);                      argv[i+1]);
                   cerr << argv[0] << ": " << MessageLoader::getMessage(parms) <<
                       endl;
                   exit(1);
         }         }
  
         // Kill the cimserver process              sock = int(x);
         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  
         cimserver_exit(1);  
  
               // Remove "-x <sock>" from argv-argc.
   
               memmove(argv + i, argv + i + 2, sizeof(char*) * (argc - i - 1));
               argc -= 2;
               break;
     }     }
     catch(Exception& e)  
     {  
         //  
         // 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 CIM Server is still running.  If CIM Server  
         // is still running and the shutdown timeout has not expired,  
         // loop and wait one second until either the CIM Server is  
         // terminated or timeout expires.  If timeout expires and  
         // the CIM Server is still running, kill the CIMServer process.  
         //  
         Uint32 maxWaitTime = timeoutValue - 2;  
         Boolean running = isCIMServerRunning();  
         while ( running && maxWaitTime > 0 )  
         {  
             System::sleep(1);  
             running = isCIMServerRunning();  
             maxWaitTime = maxWaitTime - 1;  
         }         }
  
         if (running)      if (sock == -1)
         {  
            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          MessageLoaderParms parms(
                 Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,              "src.Server.cimserver.MISSING_OPTION",
                     "src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",              "Missing $0 option.",
                     "Shutdown timeout expired.  Forced shutdown initiated.");              OPT);
                 MessageLoaderParms parms("src.Server.cimserver.TIMEOUT_EXPIRED_SERVER_KILLED",          cerr << argv[0] << ": " << MessageLoader::getMessage(parms) << endl;
                     "Shutdown timeout expired.  Forced shutdown initiated.");          exit(1);
                 cout << MessageLoader::getMessage(parms) << endl;  
                 exit(0);  
             }  
 #endif  
         }  
     }     }
  
     return;      return sock;
 } }
  
   #endif /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION */
  
 ///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
 //  MAIN //  MAIN
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
   
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;      String pegasusHome;
     String logsDirectory = String::EMPTY;  
     Boolean daemonOption = false;  
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Uint32 timeoutValue  = 0;      Boolean debugOutputOption = false;
  
 //l10n  
 // Set Message loading to process locale // Set Message loading to process locale
 MessageLoader::_useProcessLocale = true; MessageLoader::_useProcessLocale = true;
 //l10n  
   
 #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.  #if defined(PEGASUS_OS_AIX) && defined(PEGASUS_HAS_MESSAGES)
     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;      setlocale(LC_ALL, "");
 #endif #endif
  
 #ifndef PEGASUS_OS_TYPE_WINDOWS #ifndef PEGASUS_OS_TYPE_WINDOWS
     //     //
     // Get environment variables:     // Get environment variables:
     //     //
 #ifdef PEGASUS_OS_OS400  # if defined(PEGASUS_OS_AIX) && defined(PEGASUS_USE_RELEASE_DIRS)
 #pragma convert(37)      pegasusHome = AIX_RELEASE_PEGASUS_HOME;
     const char* tmp = getenv("PEGASUS_HOME");  # elif !defined(PEGASUS_USE_RELEASE_DIRS) || \
 #pragma convert(0)      defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
     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)
Line 575 
Line 452 
 #else #else
  
   // windows only   // windows only
   setHome(pegasusHome);      //setHome(pegasusHome);
       pegasusHome = _cimServerProcess->getHome();
 #endif #endif
     // on Windows NT if there are no command-line options, run as a service  
  
     if (argc == 1 )  #ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
   
       // If invoked with "--executor-socket <socket>" option, then use executor.
   
       Executor::setSock(_extractExecutorSockOpt(argc, argv));
   
       // Ping executor to verify the specified socket is valid.
   
       if (Executor::ping() != 0)
     {     {
       cim_server_service(argc, argv);          MessageLoaderParms parms("src.Server.cimserver.EXECUTOR_PING_FAILED",
               "Failed to ping the executor on the specified socket.");
           cerr << argv[0] << ": " << MessageLoader::getMessage(parms) << endl;
           exit(1);
     }     }
     else  
     {  #endif /* !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */
   
         // Get help, version, and shutdown options         // Get help, version, and shutdown options
  
         for (int i = 1; i < argc; )         for (int i = 1; i < argc; )
         {         {
             const char* arg = argv[i];             const char* arg = argv[i];
               if (String::equal(arg,"--help"))
               {
                       PrintHelp(argv[0]);
                       exit(0);
               }
               else if (String::equal(arg,"--version"))
               {
                   cout << _cimServerProcess->getCompleteVersion() << endl;
                   exit(0);
               }
             // Check for -option             // Check for -option
             if (*arg == '-')              else if (*arg == '-')
             {             {
                 // Get the option                 // Get the option
                 const char* option = arg + 1;                 const char* option = arg + 1;
Line 603 
Line 501 
                 if (*option == OPTION_VERSION &&                 if (*option == OPTION_VERSION &&
                     strlen(option) == 1)                     strlen(option) == 1)
                 {                 {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)                      cout << _cimServerProcess->getCompleteVersion() << endl;
                     cout << PLATFORM_PRODUCT_VERSION << endl;  
 #else  
                     cout << PEGASUS_VERSION << endl;  
 #endif  
                     exit(0);                     exit(0);
                 }                 }
                 //                 //
Line 619 
Line 513 
                     PrintHelp(argv[0]);                     PrintHelp(argv[0]);
                     exit(0);                     exit(0);
                 }                 }
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  #if !defined(PEGASUS_USE_RELEASE_DIRS)
                 else if (*option == OPTION_HOME &&                 else if (*option == OPTION_HOME &&
                         (strlen(option) == 1))                         (strlen(option) == 1))
                 {                 {
Line 629 
Line 523 
                     }                     }
                     else                     else
                     {                     {
                         //l10n  
                         //cout << "Missing argument for option -" << option << endl;  
                         String opt(option);                         String opt(option);
                         MessageLoaderParms parms("src.Server.cimserver.MISSING_ARGUMENT",                          MessageLoaderParms parms(
                               "src.Server.cimserver.MISSING_ARGUMENT",
                                                                  "Missing argument for option -$0",                                                                  "Missing argument for option -$0",
                                                                  opt);                                                                  opt);
                                 cout << MessageLoader::getMessage(parms) << endl;                                 cout << MessageLoader::getMessage(parms) << endl;
Line 643 
Line 536 
                     argc -= 2;                     argc -= 2;
                 }                 }
 #endif #endif
 #if defined(PEGASUS_OS_HPUX)  
                 //                 //
                 // Check to see if user asked for the version (-X option):                  // Check to see if user asked for debug output (-X option):
                 //                 //
                 if (*option == OPTION_BINDVERBOSE &&                  else if (*option == OPTION_DEBUGOUTPUT &&
                         (strlen(option) == 1))                         (strlen(option) == 1))
                 {                 {
                     System::bindVerbose = true;                      MessageLoaderParms parms(
                     //l10n                          "src.Server.cimserver.UNSUPPORTED_DEBUG_OPTION",
                     //cout << "Unsupported debug option, BIND_VERBOSE, enabled."                          "Unsupported debug output option is enabled.");
                          //<< endl;  
                     MessageLoaderParms parms("src.Server.cimserver.UNSUPPORTED_DEBUG_OPTION",  
                                                                  "Unsupported debug option, BIND_VERBOSE, enabled.");  
                         cout << MessageLoader::getMessage(parms) << endl;                         cout << MessageLoader::getMessage(parms) << endl;
   
                       debugOutputOption = true;
   
   #if defined(PEGASUS_OS_HPUX)
                       System::bindVerbose = true;
   #endif
   
                     // 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--;
                 }                 }
 #endif  
                 //                 //
                 // Check to see if user asked for shutdown (-s option):                 // Check to see if user asked for shutdown (-s option):
                 //                 //
Line 669 
Line 564 
                         (strlen(option) == 1))                         (strlen(option) == 1))
                 {                 {
                     //                     //
                     // check to see if user is root  
                     //  
 #ifndef PEGASUS_OS_OS400  
                     if (!System::isPrivilegedUser(System::getEffectiveUserName()))  
                     {  
                         //l10n  
                         //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);  
                     }  
 #endif  
   
                     //  
                     // Check to see if shutdown has already been specified:                     // Check to see if shutdown has already been specified:
                     //                     //
                     if (shutdownOption)                     if (shutdownOption)
                     {                     {
                         //l10n                          MessageLoaderParms parms(
                         //cout << "Duplicate shutdown option specified." << endl;                              "src.Server.cimserver.DUPLICATE_SHUTDOWN_OPTION",
                         MessageLoaderParms parms("src.Server.cimserver.DUPLICATE_SHUTDOWN_OPTION",  
                                                                          "Duplicate shutdown option specified.");                                                                          "Duplicate shutdown option specified.");
  
                         cout << MessageLoader::getMessage(parms) << endl;                         cout << MessageLoader::getMessage(parms) << endl;
Line 705 
Line 582 
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc--;                     argc--;
                 }                 }
 #ifdef PEGASUS_OS_TYPE_WINDOWS                  else
                 else if (strcmp(option, OPTION_INSTALL) == 0)                      i++;
                 {              }
               else
                   i++;
           }
   
                   //                   //
                   // Install as a NT service      // Set the value for pegasusHome property
                   //                   //
                   char *opt_arg = NULL;      ConfigManager::setPegasusHome(pegasusHome);
                   if (i+1 < argc)  
                   {  
                     opt_arg = argv[i+1];  
  
                   }      //
                   if(cimserver_install_nt_service(opt_arg))      // Do the platform specific run
                   {      //
                      //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;      return _cimServerProcess->platform_run(
                       exit(0);          argc, argv, shutdownOption, debugOutputOption);
                   }                   }
                   else  
   void CIMServerProcess::cimserver_stop()
                   {                   {
                       exit(0);      _cimServer->shutdownSignal();
                   }  
                 }                 }
                 else if (strcmp(option, OPTION_REMOVE) == 0)  
                 {  
                   //                   //
                   // Remove Pegasus as an NT service  // The main, common, running code
                   //                   //
                   char *opt_arg = NULL;  // NOTE: Do NOT call exit().  Use return(), otherwise some platforms
                   if (i+1 < argc)  // will fail to shutdown properly/cleanly.
                   {  //
                     opt_arg = argv[i+1];  // TODO: Current change minimal for platform "service" shutdown bug fixes.
                   }  // Perhaps further extract out common stuff and put into main(), put
                   if(cimserver_remove_nt_service(opt_arg))  // 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 better (instead of exit(), etc).
   //
   
   int CIMServerProcess::cimserver_run(
       int argc,
       char** argv,
       Boolean shutdownOption,
       Boolean debugOutputOption)
                   {                   {
                       //l10n      Boolean daemonOption = false;
                       //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);  
                   }  
                   else  
                   {  
                       exit(0);  
                   }  
   
                 }  
                 else if (strcmp(option, OPTION_START) == 0)  
                 {  
                   //  
                   // Start as a NT service  
                   //  
                   char *opt_arg = NULL;  
                   if (i+1 < argc)  
                   {  
                     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);  
                   }  
                   else  
                   {  
                       exit(0);  
                   }  
                 }  
                 else if (strcmp(option, OPTION_STOP) == 0)  
                 {  
                   //  
                   // Stop as a NT service  
                   //  
                   char *opt_arg = NULL;  
                   if (i+1 < argc)  
                   {  
                     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);  
                   }  
                   else  
                   {  
                       exit(0);  
                   }  
                 }  
 #endif  
                 else  
                     i++;  
             }  
             else  
                 i++;  
         }  
     }  
   
     //  
     // Set the value for pegasusHome property  
     //  
     ConfigManager::setPegasusHome(pegasusHome);  
  
     //     //
     // Get an instance of the Config Manager.     // Get an instance of the Config Manager.
     //     //
     configManager = ConfigManager::getInstance();      ConfigManager* configManager = ConfigManager::getInstance();
       configManager->useConfigFiles = true;
  
       try
       {
     //     //
     // 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.          // line.  NOTE: If shutdownOption=true, the contents of current config
           // file are not overwritten by the planned config file.
     //     //
     try          GetOptions(configManager, argc, argv, shutdownOption);
     {  
         GetOptions(configManager, argc, argv, pegasusHome);  
     }  
     catch (Exception& e)  
     {  
 #ifdef PEGASUS_OS_OS400  
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,  
                         "$0: $1",argv[0] ,e.getMessage());  
 #else  
         cerr << argv[0] << ": " << e.getMessage() << endl;  
 #endif  
         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(  
         configManager->getCurrentValue("enableHttpConnection"), "true");  
     Boolean enableHttpsConnection = String::equal(  
         configManager->getCurrentValue("enableHttpsConnection"), "true");  
   
     // 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;  
         exit(1);  
     }  
 #endif  
  
     try  
     {  
         //         //
         // Check to see if we should Pegasus as a daemon          // Initialize the message home directory in the MessageLoader.
           // This is the default directory where the resource bundles are found.
         //         //
           MessageLoader::setPegasusMsgHome(ConfigManager::getHomedPath(
               ConfigManager::getInstance()->getCurrentValue("messageDir")));
  
         if (String::equal(configManager->getCurrentValue("daemon"), "true"))          //
         {          // Check to see if we should start Pegasus as a daemon
             daemonOption = true;          //
         }          daemonOption = ConfigManager::parseBooleanValue(
               configManager->getCurrentValue("daemon"));
         // Get the log file directory definition.  
         // We put String into Cstring because  
         // Directory functions only handle Cstring.  
         // ATTN-KS: create String based directory functions.  
  
         logsDirectory = configManager->getCurrentValue("logdir");  #if !defined(PEGASUS_USE_SYSLOGS)
         logsDirectory =          String logsDirectory = ConfigManager::getHomedPath(
             ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));              configManager->getCurrentValue("logdir"));
  
         // Set up the Logger. This does not open the logs          // Set up the Logger.  This does not open the logs.
         // Might be more logical to clean before set.         // Might be more logical to clean before set.
         // ATTN: Need tool to completely disable logging.  
   
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \  
 !defined(PEGASUS_OS_OS400)  
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
 #endif #endif
  
Line 920 
Line 673 
         {         {
             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);
   #ifdef PEGASUS_SLP_REG_TIMEOUT
               // To deregister Pegasus with SLP
               unregisterPegasusFromSLP();
   #endif
  
             shutdownCIMOM(timeoutValue);              ServerShutdownClient serverShutdownClient(&_serverRunStatus);
               serverShutdownClient.shutdown(timeoutValue);
  
 #ifdef PEGASUS_OS_OS400              MessageLoaderParms parms(
             //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",                         "src.Server.cimserver.SERVER_STOPPED",
                         "CIM Server stopped.");                         "CIM Server stopped.");
 #else  
                         //l10n  
             //cout << "CIM Server stopped." << endl;  
             MessageLoaderParms parms("src.Server.cimserver.SERVER_STOPPED",  
                                                          "CIM Server stopped.");  
  
             cout << MessageLoader::getMessage(parms) << endl;             cout << MessageLoader::getMessage(parms) << endl;
 #endif              return 0;
             cimserver_exit(0);  
         }         }
  
   #if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS)
         // 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) && \  
 !defined(PEGASUS_OS_OS400)  
         //l10n  
         //cout << "Logs Directory = " << logsDirectory << endl;  
         MessageLoaderParms parms("src.Server.cimserver.LOGS_DIRECTORY",         MessageLoaderParms parms("src.Server.cimserver.LOGS_DIRECTORY",
                                              "Logs Directory = ");                                              "Logs Directory = ");
         cout << MessageLoader::getMessage(parms) << logsDirectory << endl;         cout << MessageLoader::getMessage(parms) << logsDirectory << endl;
 #endif #endif
   
   
     }  
     catch (UnrecognizedConfigProperty e)  
     {  
   
 #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  
         //l10n  
         //cout << "Error: " << e.getMessage() << endl;  
         MessageLoaderParms parms("src.Server.cimserver.ERROR",  
                                                          "Error: $0",  
                                                          e.getMessage());  
         cout << MessageLoader::getMessage(parms) << endl;  
 #endif  
     }     }
       catch (Exception& e)
     Uint32 portNumberHttps;  
     Uint32 portNumberHttp;  
   
     if (enableHttpsConnection)  
     {     {
         String httpsPort = configManager->getCurrentValue("httpsPort");          MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",
         CString portString = httpsPort.getCString();              "cimserver not started: $0", e.getMessage());
         char* end = 0;          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
         Uint32 port = strtol(portString, &end, 10);              MessageLoader::getMessage(parms));
         assert(end != 0 && *end == '\0');          cerr << MessageLoader::getMessage(parms) << endl;
  
         //          return 1;
         // Look up the WBEM-HTTPS port number  
         //  
         portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);  
     }     }
  
     if (enableHttpConnection)  #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) && defined(PEGASUS_ZOS_SECURITY)
     {      startupCheckBPXServer(true);
         String httpPort = configManager->getCurrentValue("httpPort");      startupCheckProfileCIMSERVclassWBEM();
         CString portString = httpPort.getCString();      startupEnableMSC();
         char* end = 0;  #endif
         Uint32 port = strtol(portString, &end, 10);  
         assert(end != 0 && *end == '\0');  
   
         //  
         // Look up the WBEM-HTTP port number  
         //  
         portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);  
     }  
  
   #if defined(PEGASUS_DEBUG)
     // Put out startup up message.     // Put out startup up message.
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \      cout << _cimServerProcess->getProductName() << " " <<
 !defined(PEGASUS_OS_OS400)          _cimServerProcess->getCompleteVersion() << endl;
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;  
     //l10n  
     //cout << "Built " << __DATE__ << " " << __TIME__ << endl;  
     //cout <<"Starting..."  
     MessageLoaderParms parms("src.Server.cimserver.STARTUP_MESSAGE",  
                                                  "Built $0 $1\nStarting...",  
                                                  __DATE__,  
                                                  __TIME__);  
 #endif #endif
  
 //l10n  
 // reset message loading to NON-process locale // reset message loading to NON-process locale
 MessageLoader::_useProcessLocale = false; MessageLoader::_useProcessLocale = false;
 //l10n  
  
     // do we need to run as a daemon ?      // Get the parent's PID before forking
       _serverRunStatus.setParentPid(System::getPID());
   
       // Do not fork when using privilege separation (executor will daemonize
       // itself later).
     if (daemonOption)     if (daemonOption)
     {     {
         if(-1 == cimserver_fork())          if (-1 == _cimServerProcess->cimserver_fork())
 #ifndef PEGASUS_OS_OS400              return -1;
         {  
             exit(-1);  
         }  
 #else  
         {  
             return(-1);  
         }  
         else  
         {  
             return(0);  
         }  
 #endif  
   
     }     }
  
 // l10n  
     // Now we are after the fork...     // Now we are after the fork...
     // Create a dummy Thread object that can be used to store the     // Create a dummy Thread object that can be used to store the
     // AcceptLanguages object for CIM requests that are serviced      // AcceptLanguageList object for CIM requests that are serviced
     // by this thread (initial thread of server).  Need to do this     // by this thread (initial thread of server).  Need to do this
     // because this thread is not in a ThreadPool, but is used     // because this thread is not in a ThreadPool, but is used
     // to service CIM requests.     // to service CIM requests.
     // The run function for the dummy Thread should never be called,     // The run function for the dummy Thread should never be called,
     Thread *dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);      dummyInitialThread = new Thread(dummyThreadFunc, NULL, false);
     Thread::setCurrent(dummyInitialThread);     Thread::setCurrent(dummyInitialThread);
     AcceptLanguages default_al;      AcceptLanguageList default_al;
     try{      try
          default_al = AcceptLanguages::getDefaultAcceptLanguages();      {
          Thread::setLanguages(new AcceptLanguages(default_al));          default_al = LanguageParser::getDefaultAcceptLanguages();
     }catch(InvalidAcceptLanguageHeader e){          Thread::setLanguages(new AcceptLanguageList(default_al));
       }
       catch (InvalidAcceptLanguageHeader& e)
       {
           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                   "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",                                   "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",
                           "Could not convert the system process locale into a valid AcceptLanguage format.");              "Could not convert the system process locale into a valid "
                   "AcceptLanguage format.");
                   Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,                   Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                                  e.getMessage());                                                  e.getMessage());
     }     }
  
   #ifndef PEGASUS_OS_TYPE_WINDOWS
       umask(S_IRWXG|S_IRWXO);
 #ifdef PEGASUS_OS_OS400  
     // Special server initialization code for OS/400.  
     if (cimserver_initialize() != 0)  
     {  
         // do some logging here!  
         //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");  
         exit(-1);  
     }  
 #endif #endif
  
       // Start up the CIM Server
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)      try
     umask(S_IWGRP|S_IWOTH);  
   
     //  
     // check if CIMServer is already running  
     // if CIMServer is already running, print message and  
     // notify parent process (if there is a parent process) to terminate  
     //  
     if(isCIMServerRunning())  
     {     {
         //l10n  #if defined(PEGASUS_OS_TYPE_UNIX)
                 //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          // Lock the CIMSERVER_LOCK_FILE during CIM Server start-up to prevent
           // concurrent writes to this file by multiple cimserver processes
           // starting at the same time.
         //         //
         if (daemonOption)          CString startupLockFileName = ConfigManager::getHomedPath(
                 notify_parent(1);              PEGASUS_CIMSERVER_START_LOCK_FILE).getCString();
  
         exit(1);          // Make sure the start-up lock file exists
           FILE* startupLockFile;
           if ((startupLockFile = fopen(startupLockFileName, "w")) != 0)
           {
               fclose(startupLockFile);
     }     }
  
           AutoFileLock fileLock(startupLockFileName);
 #endif #endif
  
     // try loop to bind the address, and run the server  #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)
     try          //
           // Check if a CIM Server is already running.  If so, print an error
           // message and notify the parent process (if there is one) to terminate
           //
           if (_serverRunStatus.isServerRunning())
           {
               MessageLoaderParms parms(
                   "src.Server.cimserver.UNABLE_TO_START_SERVER_ALREADY_RUNNING",
                   "Unable to start CIMServer. CIMServer is already running.");
               Logger::put(
                   Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                   MessageLoader::getMessage(parms));
               cerr << MessageLoader::getMessage(parms) << endl;
   
               if (daemonOption)
     {     {
                   _cimServerProcess->notify_parent(1);
               }
  
               return 1;
           }
  
           //
           // Declare ourselves as the running CIM Server process, and write our
           // PID to the PID file.
           //
           _serverRunStatus.setServerRunning();
   #endif
  
           // Create and initialize the CIMServer object
  
           _cimServer = new CIMServer();
  
 #if defined(PEGASUS_MONITOR2)          Boolean enableHttpConnection = ConfigManager::parseBooleanValue(
         monitor_2 monitor;              configManager->getCurrentValue("enableHttpConnection"));
         CIMServer server(&monitor);          Boolean enableHttpsConnection = ConfigManager::parseBooleanValue(
 #else              configManager->getCurrentValue("enableHttpsConnection"));
  
         Monitor monitor(true);  #ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
         CIMServer server(&monitor);          // Make sure at least one connection is enabled
           if (!enableHttpConnection && !enableHttpsConnection)
           {
               MessageLoaderParms parms(
                   "src.Server.cimserver.HTTP_NOT_ENABLED_SERVER_NOT_STARTING",
                   "Neither HTTP nor HTTPS connection is enabled.");
               throw Exception(parms);
           }
 #endif #endif
  
           // The server HTTP and HTTPS ports are determined via this algorithm:
           // 1) If the user explicitly specified a port, use it.
           // 2) If the user did not specify a port, get the port from the
           //    services file.
           // 3) If no value is specified in the services file, use the IANA WBEM
           //    default port.
           // Note that 2 and 3 are done within the System::lookupPort method
           // An empty string from the ConfigManager implies that the user did not
           // specify a port.
  
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false);              Uint32 portNumberHttp = 0;
             //l10n              String httpPort = configManager->getCurrentValue("httpPort");
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,              if (httpPort == String::EMPTY)
                         //"Listening on HTTP port $0.", portNumberHttp);              {
                   //
             Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,                  // Look up the WBEM-HTTP port number
                                         "src.Server.cimserver.LISTENING_ON_HTTP_PORT",                  //
                                 "Listening on HTTP port $0.", portNumberHttp);                  portNumberHttp = System::lookupPort(
                       WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);
         }         }
         if (enableHttpsConnection)              else
         {         {
             server.addAcceptor(false, portNumberHttps, true);                  //
             //l10n                  // user-specified
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,                  //
                         //"Listening on HTTPS port $0.", portNumberHttps);                  CString portString = httpPort.getCString();
             Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,                  char* end = 0;
                                         "src.Server.cimserver.LISTENING_ON_HTTPS_PORT",                  portNumberHttp = strtol(portString, &end, 10);
                                 "Listening on HTTPS port $0.", portNumberHttps);                  if (!(end != 0 && *end == '\0'))
                   {
                       throw InvalidPropertyValue("httpPort", httpPort);
                   }
         }         }
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  
         server.addAcceptor(true, 0, false);  
         //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.");  
 #endif  
  
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400)              _cimServer->addAcceptor(false, portNumberHttp, false);
         if (enableHttpConnection)  
         {              MessageLoaderParms parms(
             //l10n                  "src.Server.cimserver.LISTENING_ON_HTTP_PORT",
             //cout << "Listening on HTTP port " << portNumberHttp << endl;  
           MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_HTTP_PORT",  
                                    "Listening on HTTP port $0.", portNumberHttp);                                    "Listening on HTTP port $0.", portNumberHttp);
               Logger::put(
                   Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                   MessageLoader::getMessage(parms));
   #if defined(PEGASUS_DEBUG)
                 cout << MessageLoader::getMessage(parms) << endl;                 cout << MessageLoader::getMessage(parms) << endl;
   #endif
         }         }
   
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
             //l10n              Uint32 portNumberHttps = 0;
             //cout << "Listening on HTTPS port " << portNumberHttps << endl;              String httpsPort = configManager->getCurrentValue("httpsPort");
             MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_HTTPS_PORT",              if (httpsPort == String::EMPTY)
               {
                   //
                   // Look up the WBEM-HTTPS port number
                   //
                   portNumberHttps = System::lookupPort(
                       WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);
               }
               else
               {
                   //
                   // user-specified
                   //
                   CString portString = httpsPort.getCString();
                   char* end = 0;
                   portNumberHttps = strtol(portString, &end, 10);
                   if (!(end != 0 && *end == '\0'))
                   {
                       throw InvalidPropertyValue("httpsPort", httpsPort);
                   }
               }
   
               _cimServer->addAcceptor(false, portNumberHttps, true);
   
               MessageLoaderParms parms(
                   "src.Server.cimserver.LISTENING_ON_HTTPS_PORT",
                                      "Listening on HTTPS port $0.", portNumberHttps);                                      "Listening on HTTPS port $0.", portNumberHttps);
               Logger::put(
                   Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                   MessageLoader::getMessage(parms));
   #if defined(PEGASUS_DEBUG)
                 cout << MessageLoader::getMessage(parms) << endl;                 cout << MessageLoader::getMessage(parms) << endl;
   #endif
         }         }
 # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  
         //l10n  #ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
         //cout << "Listening on local connection socket" << endl;          {
         MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_LOCAL",              _cimServer->addAcceptor(true, 0, false);
   
               MessageLoaderParms parms(
                   "src.Server.cimserver.LISTENING_ON_LOCAL",
                                  "Listening on local connection socket.");                                  "Listening on local connection socket.");
               Logger::put(
                   Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                   MessageLoader::getMessage(parms));
   # if defined(PEGASUS_DEBUG)
         cout << MessageLoader::getMessage(parms) << endl;         cout << MessageLoader::getMessage(parms) << endl;
 # endif # endif
           }
 #endif #endif
  
         // bind throws an exception if the bind fails          _cimServer->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 there is cimserver ready to serve CIM requests.         // so user knows that there is cimserver ready to serve CIM requests.
         if (daemonOption)         if (daemonOption)
                 notify_parent(0);  
   
         time_t last = 0;  
   
 #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  
         // save the process id of the cimserver process in the file  
         //  
         // remove the old file if it exists  
         System::removeFile(CIMSERVER_START_FILE);  
   
         // open the file  
         FILE *pid_file = fopen(CIMSERVER_START_FILE, "w");  
   
         if (pid_file)  
         {         {
             // save the pid in the file  #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
             fprintf(pid_file, "%ld\n", (long)server_pid);              Executor::daemonizeExecutor();
             fclose(pid_file);  #else
         }              _cimServerProcess->notify_parent(0);
 #endif #endif
           }
  
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \  #if defined(PEGASUS_DEBUG)
 !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
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,
         //l10n              Logger::INFORMATION,
         //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.",  
                     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",                                 "src.Server.cimserver.STARTED_VERSION",
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PEGASUS_NAME, PEGASUS_VERSION);              _cimServerProcess->getProductName(),
               _cimServerProcess->getCompleteVersion());
   
   #if defined(PEGASUS_OS_TYPE_UNIX) && !defined(PEGASUS_OS_ZOS)
           if (daemonOption && !debugOutputOption)
           {
               // Direct standard input, output, and error to /dev/null,
               // since we are running as a daemon.
               close(0);
               open("/dev/null", O_RDONLY);
               close(1);
               open("/dev/null", O_RDWR);
               close(2);
               open("/dev/null", O_RDWR);
           }
 #endif #endif
       }
       catch (Exception& e)
       {
           MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",
               "cimserver not started: $0", e.getMessage());
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
               MessageLoader::getMessage(parms));
           cerr << MessageLoader::getMessage(parms) << endl;
   
           //
           // notify parent process (if there is a parent process) to terminate
           //
           if (daemonOption)
               _cimServerProcess->notify_parent(1);
  
           deleteCIMServer();
           return 1;
       }
   
       // Run the main CIM Server loop
   
       try
       {
   #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
   
           // ARM is a z/OS internal restart facility.
           // This is a z/OS specific change.
   
           // Instatiating the automatic restart manager for zOS
           ARM_zOS automaticRestartManager;
   
           // register to zOS ARM
           automaticRestartManager.Register();
   
   #endif
  
         //         //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown
         //         //
         while( !server.terminated() )          while (!_cimServer->terminated())
         {         {
               _cimServer->runForever();
           server.runForever();  
   
         }         }
         MessageQueueService::force_shutdown(true);  
         //         //
         // normal termination         // normal termination
         //         //
         // Put server shutdown message to the logger  
 #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);  
 #endif  
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
         //  
         // close the file created at startup time to indicate that the  
         // cimserver has terminated normally.  
         //  
         FileSystem::removeFile(CIMSERVER_START_FILE);  
 #endif  
     }  
     catch(Exception& e)  
     {  
  
         //l10n          // ARM is a z/OS internal restart facility.
         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,          // This is a z/OS specific change.
                     //"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          // register to zOS ARM
         //l10n          automaticRestartManager.DeRegister();
         //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
  
         //          // Put server shutdown message to the logger
         // notify parent process (if there is a parent process) to terminate          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,
         //              Logger::INFORMATION, "src.Server.cimserver.STOPPED",
         if (daemonOption)              "$0 stopped.", _cimServerProcess->getProductName());
                 notify_parent(1);      }
       catch (Exception& e)
       {
           MessageLoaderParms parms(
               "src.Server.cimserver.ERROR",
               "Error: $0",
               e.getMessage());
           Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               MessageLoader::getMessage(parms));
           cerr << MessageLoader::getMessage(parms) << endl;
  
           deleteCIMServer();
         return 1;         return 1;
     }     }
  
       deleteCIMServer();
     return 0;     return 0;
 } }


Legend:
Removed from v.1.116  
changed lines
  Added in v.1.204

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2