(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.194 and 1.196

version 1.194, 2007/03/30 18:03:01 version 1.196, 2007/04/03 18:51:01
Line 619 
Line 619 
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;      String pegasusHome;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Boolean debugOutputOption = false;     Boolean debugOutputOption = false;
  
Line 846 
Line 846 
     Boolean shutdownOption,     Boolean shutdownOption,
     Boolean debugOutputOption)     Boolean debugOutputOption)
 { {
     String logsDirectory = String::EMPTY;      String logsDirectory;
     Boolean daemonOption = false;     Boolean daemonOption = false;
  
     //     //
Line 1486 
Line 1486 
         //         //
 #endif #endif
     }     }
     catch(Exception& e)      catch(BindFailedException& e)
     {     {
         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
             "src.Server.cimserver.SERVER_NOT_STARTED",             "src.Server.cimserver.SERVER_NOT_STARTED",
Line 1508 
Line 1508 
         deleteCIMServer();         deleteCIMServer();
         return 1;         return 1;
     }     }
       catch(Exception& e)
       {
       Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               "src.Server.cimserver.ERROR",
               "Error: $0", e.getMessage());
   #ifndef PEGASUS_OS_OS400
       MessageLoaderParms parms("src.Server.cimserver.ERROR",
                                "Error: $0", e.getMessage());
       PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
   #endif
           //
           // notify parent process (if there is a parent process) to terminate
           //
           if (daemonOption)
                   _cimServerProcess->notify_parent(1);
   
           deleteCIMServer();
           return 1;
       }
  
     deleteCIMServer();     deleteCIMServer();
     return 0;     return 0;


Legend:
Removed from v.1.194  
changed lines
  Added in v.1.196

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2