(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.129

version 1.121, 2003/10/22 14:26:19 version 1.129, 2004/01/29 21:17:27
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 766 
Line 770 
     }     }
     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 883 
Line 893 
  
  
     }     }
     catch (UnrecognizedConfigProperty e)      catch (UnrecognizedConfigProperty& e)
     {     {
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
Line 986 
Line 996 
     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 1022 
 #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 1058 
  
  
  
 #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 1135 
  
         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 1212 
             "$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 1250 
  
     return 0;     return 0;
 } }
   
   
   
   

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