(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.87 and 1.88

version 1.87, 2003/03/25 23:39:59 version 1.88, 2003/03/27 17:27:26
Line 267 
Line 267 
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Unable to connect to CIM Server.  CIM 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.         // The server job may still be active but not responding.
         // Kill the job if it exists.         // Kill the job if it exists.
Line 319 
Line 319 
  
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
             Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Failed to shutdown server: $0", "The repository may be empty.");                     "Failed to shutdown server: $0", "The repository may be empty.");
         }         }
         else         else
         {         {
             Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                         "Failed to shutdown server: $0", e.getMessage());                         "Failed to shutdown server: $0", e.getMessage());
         }         }
         // Kill the server job.         // Kill the server job.
Line 625 
Line 625 
     catch (Exception& e)     catch (Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                         "$0: $1",argv[0] ,e.getMessage());                         "$0: $1",argv[0] ,e.getMessage());
 #else #else
         cerr << argv[0] << ": " << e.getMessage() << endl;         cerr << argv[0] << ": " << e.getMessage() << endl;
Line 642 
Line 642 
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
     if (!enableHttpConnection && !enableHttpsConnection)     if (!enableHttpConnection && !enableHttpsConnection)
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
             "Neither HTTP nor HTTPS connection is enabled.  "             "Neither HTTP nor HTTPS connection is enabled.  "
             "CIMServer will not be started.");             "CIMServer will not be started.");
         cerr << "Neither HTTP nor HTTPS connection is enabled.  "         cerr << "Neither HTTP nor HTTPS connection is enabled.  "
Line 692 
Line 692 
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
             Logger::put(Logger::ERROR_LOG, "", Logger::INFORMATION,              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "CIM Server stopped.");                         "CIM Server stopped.");
 #else #else
             cout << "CIM Server stopped." << endl;             cout << "CIM Server stopped." << endl;
Line 715 
Line 715 
     {     {
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "Error: $0",e.getMessage());                     "Error: $0",e.getMessage());
 #else #else
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
Line 788 
Line 788 
     if (cimserver_initialize() != 0)     if (cimserver_initialize() != 0)
     {     {
         // do some logging here!         // do some logging here!
         Logger::put(Logger::ERROR_LOG, "", Logger::SEVERE,          Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     "CIM Server failed to initialize");                     "CIM Server failed to initialize");
         exit(-1);         exit(-1);
     }     }
Line 841 
Line 841 
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false);             server.addAcceptor(false, portNumberHttp, false);
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,              Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         "Listening on HTTP port $0.", portNumberHttp);                         "Listening on HTTP port $0.", portNumberHttp);
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
             server.addAcceptor(false, portNumberHttps, true);             server.addAcceptor(false, portNumberHttps, true);
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,              Logger::put(Logger::STANDARD_LOG, Sysmte::CIMSERVER, Logger::INFORMATION,
                         "Listening on HTTPS port $0.", portNumberHttps);                         "Listening on HTTPS port $0.", portNumberHttps);
         }         }
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         server.addAcceptor(true, 0, false);         server.addAcceptor(true, 0, false);
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Listening on local connection socket.");                     "Listening on local connection socket.");
 #endif #endif
  
Line 905 
Line 905 
  
         // 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) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     "Started $0 version $1.",                     "Started $0 version $1.",
                     PEGASUS_NAME, PEGASUS_VERSION);                     PEGASUS_NAME, PEGASUS_VERSION);
 #endif #endif
Line 946 
Line 946 
         //         //
         // Put server shutdown message to the logger         // Put server shutdown message to the logger
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
             "$0 stopped.", PLATFORM_PRODUCT_NAME);             "$0 stopped.", PLATFORM_PRODUCT_NAME);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
             "$0 stopped.", PEGASUS_NAME);             "$0 stopped.", PEGASUS_NAME);
 #endif #endif
  
Line 964 
Line 964 
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::STANDARD_LOG, "", Logger::WARNING,          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                     "Error: $0", e.getMessage());                     "Error: $0", e.getMessage());
 #else #else
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);

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