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

version 1.121, 2003/10/22 14:26:19 version 1.130, 2004/01/29 23:47:10
Line 192 
Line 192 
  
         cm->mergeCommandLine(argc, argv);         cm->mergeCommandLine(argc, argv);
     }     }
     catch (NoSuchFile nsf)      catch (NoSuchFile&)
     {     {
         throw nsf;          throw;
     }     }
     catch (FileNotReadable fnr)      catch (FileNotReadable&)
     {     {
         throw fnr;          throw;
     }     }
     catch (CannotRenameFile ftrf)      catch (CannotRenameFile&)
     {     {
         throw ftrf;          throw;
     }     }
     catch (ConfigFileSyntaxError cfse)      catch (ConfigFileSyntaxError&)
     {     {
         throw cfse;          throw;
     }     }
     catch(UnrecognizedConfigProperty ucp)      catch(UnrecognizedConfigProperty&)
     {     {
         throw ucp;          throw;
     }     }
     catch(InvalidPropertyValue ipv)      catch(InvalidPropertyValue&)
     {     {
         throw ipv;          throw;
       }
       catch (CannotOpenFile&)
       {
           throw;
     }     }
 } }
  
Line 506 
Line 510 
             cimserver_exitRC(1);             cimserver_exitRC(1);
 #endif #endif
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #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)             if (kill_rc != -1)
             {             {
                 //l10n - TODO                 //l10n - TODO
Line 678 
Line 682 
                     //                     //
                     // 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()))
                     {                     {
                         //l10n                         //l10n
Line 755 
Line 759 
     //     //
     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 762 
Line 788 
     //     //
     try     try
     {     {
   #ifdef PEGASUS_OS_OS400
       if (os400StartupOption == false)
   #endif
         GetOptions(configManager, argc, argv);         GetOptions(configManager, argc, argv);
     }     }
     catch (Exception& e)     catch (Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400          Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,              "src.Server.cimserver.SERVER_NOT_STARTED",
                         "$0: $1",argv[0] ,e.getMessage());              "cimserver not started:  $0", e.getMessage());
 #else  
         cerr << argv[0] << ": " << e.getMessage() << endl;  #if !defined(PEGASUS_OS_OS400)
           MessageLoaderParms parms("src.Server.cimserver.SERVER_NOT_STARTED",
               "cimserver not started: $0", e.getMessage());
   
           PEGASUS_STD(cerr) << argv[0] << ": " << MessageLoader::getMessage(parms)
               << PEGASUS_STD(endl);
 #endif #endif
   
         return(1);         return(1);
     }     }
  
Line 787 
Line 822 
 #endif #endif
         MessageLoader::setPegasusMsgHome(messagesDir);         MessageLoader::setPegasusMsgHome(messagesDir);
  
   #ifdef PEGASUS_OS_OS400
       // Still need to declare and set the connection variables.
       // 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)
       {
         enableHttpConnection = String::equal(
             configManager->getCurrentValue("enableHttpConnection"), "true");
         enableHttpsConnection = String::equal(
             configManager->getCurrentValue("enableHttpsConnection"), "true");
       }
   #else
     Boolean enableHttpConnection = String::equal(     Boolean enableHttpConnection = String::equal(
         configManager->getCurrentValue("enableHttpConnection"), "true");         configManager->getCurrentValue("enableHttpConnection"), "true");
     Boolean enableHttpsConnection = String::equal(     Boolean enableHttpsConnection = String::equal(
         configManager->getCurrentValue("enableHttpsConnection"), "true");         configManager->getCurrentValue("enableHttpsConnection"), "true");
   #endif
  
     // Make sure at least one connection is enabled     // Make sure at least one connection is enabled
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
Line 823 
Line 878 
             daemonOption = true;             daemonOption = true;
         }         }
  
   #ifdef PEGASUS_OS_OS400
       if (os400StartupOption == false)
       {
   #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 831 
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.
Line 883 
Line 945 
  
  
     }     }
     catch (UnrecognizedConfigProperty e)      catch (UnrecognizedConfigProperty& e)
     {     {
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
Line 986 
Line 1048 
     try{     try{
          default_al = AcceptLanguages::getDefaultAcceptLanguages();          default_al = AcceptLanguages::getDefaultAcceptLanguages();
          Thread::setLanguages(new AcceptLanguages(default_al));          Thread::setLanguages(new AcceptLanguages(default_al));
     }catch(InvalidAcceptLanguageHeader e){      }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.");
Line 1012 
Line 1074 
 #endif #endif
  
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #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 1048 
Line 1110 
  
  
  
 #if defined(PEGASUS_MONITOR2)  #if defined(PEGASUS_USE_23HTTPMONITOR)
         monitor_2 monitor;          Monitor monitor(true);
         CIMServer server(&monitor);         CIMServer server(&monitor);
 #else #else
           monitor_2 monitor;
         Monitor monitor(true);  
         CIMServer server(&monitor);         CIMServer server(&monitor);
 #endif #endif
  
Line 1126 
Line 1187 
  
         time_t last = 0;         time_t last = 0;
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #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
Line 1203 
Line 1264 
             "$0 stopped.", PEGASUS_NAME);             "$0 stopped.", PEGASUS_NAME);
 #endif #endif
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  #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.
Line 1241 
Line 1302 
  
     return 0;     return 0;
 } }
   
   
   
   

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