(file) Return to CIMServer.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Server

Diff for /pegasus/src/Pegasus/Server/CIMServer.cpp between version 1.232 and 1.233

version 1.232, 2008/07/08 12:09:08 version 1.233, 2008/08/14 17:30:46
Line 174 
Line 174 
     mark = true;     mark = true;
  
     Logger::put_l(Logger::ERROR_LOG, "CIMServer", Logger::SEVERE,     Logger::put_l(Logger::ERROR_LOG, "CIMServer", Logger::SEVERE,
         "Pegasus.Server.CIMServer.RECEIVE_SYN_SIGNAL.PEGASUS_OS_PASE", \          MessageLoaderParms(
         "Synchronous signal received.");              "Pegasus.Server.CIMServer.RECEIVE_SYN_SIGNAL.PEGASUS_OS_PASE",
               "Synchronous signal received."));
  
     CIMServer::shutdownSignal();     CIMServer::shutdownSignal();
 } }
Line 190 
Line 191 
     mark = true;     mark = true;
  
     Logger::put_l(Logger::ERROR_LOG, "CIMServer", Logger::SEVERE,     Logger::put_l(Logger::ERROR_LOG, "CIMServer", Logger::SEVERE,
         "Pegasus.Server.CIMServer.RECEIVE_ASYN_SIGNAL.PEGASUS_OS_PASE", \          MessageLoaderParms(
         "Asynchronous signal received.");              "Pegasus.Server.CIMServer.RECEIVE_ASYN_SIGNAL.PEGASUS_OS_PASE",
               "Asynchronous signal received."));
  
     CIMServer::shutdownSignal();     CIMServer::shutdownSignal();
 } }
Line 1184 
Line 1186 
  
         Logger::put_l(         Logger::put_l(
             Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
               MessageLoaderParms(
             "Pegasus.Server.SLP.SLP_REGISTRATION_INITIATED",             "Pegasus.Server.SLP.SLP_REGISTRATION_INITIATED",
             "SLP Registration Initiated");                  "SLP Registration Initiated"));
     }     }
  
     catch(Exception& e)     catch(Exception& e)
Line 1193 
Line 1196 
 #ifdef PEGASUS_SLP_REG_TIMEOUT #ifdef PEGASUS_SLP_REG_TIMEOUT
          Logger::put_l(          Logger::put_l(
              Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,              Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               MessageLoaderParms(
              "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_EXCEPTION",              "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_EXCEPTION",
              "CIM Server registration with External SLP Failed. Exception: $0",                  "CIM Server registration with External SLP Failed. "
                       "Exception: $0",
              e.getMessage());              e.getMessage());
 #else #else
         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,          Logger::put_l(
               Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               MessageLoaderParms(
             "Pegasus.Server.SLP.INTERNAL_SLP_REGISTRATION_FAILED_EXCEPTION",             "Pegasus.Server.SLP.INTERNAL_SLP_REGISTRATION_FAILED_EXCEPTION",
             "CIM Server registration with Internal SLP Failed. Exception: $0",                  "CIM Server registration with Internal SLP Failed. "
                       "Exception: $0",
             e.getMessage());             e.getMessage());
 #endif #endif
     }     }
Line 1207 
Line 1215 
     catch(...)     catch(...)
     {     {
 #ifdef PEGASUS_SLP_REG_TIMEOUT #ifdef PEGASUS_SLP_REG_TIMEOUT
          Logger::put_l(          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
              Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,              MessageLoaderParms(
              "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR",              "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR",
              "CIM Server registration with External SLP Failed.");                  "CIM Server registration with External SLP Failed."));
 #else #else
         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
               MessageLoaderParms(
             "Pegasus.Server.SLP.INTERNAL_SLP_REGISTRATION_FAILED_ERROR",             "Pegasus.Server.SLP.INTERNAL_SLP_REGISTRATION_FAILED_ERROR",
             "CIM Server registration with Internal SLP Failed.");                  "CIM Server registration with Internal SLP Failed."));
 #endif #endif
     }     }
  

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