(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.85 and 1.86

version 1.85, 2003/03/04 17:55:48 version 1.86, 2003/03/11 21:26:54
Line 397 
Line 397 
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOLog = false;     Boolean pegasusIOLog = false;
     String httpPort = String::EMPTY;  
     String httpsPort = String::EMPTY;  
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean useSLP = false;     Boolean useSLP = false;
     Boolean useSSL = false;  
     Boolean daemonOption = false;     Boolean daemonOption = false;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Uint32 timeoutValue  = 0;     Uint32 timeoutValue  = 0;
Line 637 
Line 634 
         exit(1);         exit(1);
     }     }
  
       // The "SSL" property overrides the enableHttp*Connection properties and
       // enables only the HTTPS connection.
       Boolean enableHttpConnection = (String::equal(
           configManager->getCurrentValue("enableHttpConnection"), "true") &&
           !String::equal(configManager->getCurrentValue("SSL"), "true"));
       Boolean enableHttpsConnection = (String::equal(
           configManager->getCurrentValue("enableHttpsConnection"), "true") ||
           String::equal(configManager->getCurrentValue("SSL"), "true"));
   
       // Make sure at least one connection is enabled
   #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
       if (!enableHttpConnection && !enableHttpsConnection)
       {
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
               "Neither HTTP nor HTTPS connection is enabled.  "
               "CIMServer will not be started.");
           cerr << "Neither HTTP nor HTTPS connection is enabled.  "
               "CIMServer will not be started." << endl;
           exit(1);
       }
   #endif
   
     try     try
     {     {
         //         //
Line 695 
Line 714 
             exit(0);             exit(0);
         }         }
  
         //  
         // Get the port numbers  
         //  
   
         httpPort = configManager->getCurrentValue("httpPort");  
   
         httpsPort = configManager->getCurrentValue("httpsPort");  
   
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \ #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
 !defined(PEGASUS_OS_OS400) !defined(PEGASUS_OS_OS400)
Line 718 
Line 729 
         {         {
             useSLP =  true;             useSLP =  true;
         }         }
   
 #if defined(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)  
         Boolean enableHttpConnection = String::equal(  
             configManager->getCurrentValue("enableHttpConnection"), "true");  
         Boolean enableHttpsConnection = String::equal(  
             configManager->getCurrentValue("enableHttpsConnection"), "true");  
   
         if (enableHttpConnection && enableHttpsConnection)  
         {  
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
                 "Enabling both HTTP and HTTPS connections is unsupported.  "  
                 "Only the HTTPS connection is enabled.");  
             cerr << "Enabling both HTTP and HTTPS connections is unsupported.  "  
                 "Only the HTTPS connection is enabled." << endl;  
         }  
         else if (!enableHttpConnection && !enableHttpsConnection)  
         {  
             Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
                 "Neither HTTP nor HTTPS connection is enabled.  "  
                 "CIMServer will not be started.");  
             cerr << "Neither HTTP nor HTTPS connection is enabled.  "  
                 "CIMServer will not be started." << endl;  
             exit(1);  
         }  
   
         useSSL = enableHttpsConnection;  
   
 #else  
         if (String::equal(configManager->getCurrentValue("SSL"), "true"))  
         {  
             useSSL =  true;  
         }  
 #endif  
     }     }
     catch (UnrecognizedConfigProperty e)     catch (UnrecognizedConfigProperty e)
     {     {
Line 763 
Line 741 
 #endif #endif
     }     }
  
     Uint32 portNumber;      Uint32 portNumberHttps;
       Uint32 portNumberHttp;
  
     char address[32];      if (enableHttpsConnection)
   
     if (useSSL)  
     {     {
         char* end = 0;          String httpsPort = configManager->getCurrentValue("httpsPort");
         CString portString = httpsPort.getCString();         CString portString = httpsPort.getCString();
           char* end = 0;
         Uint32 port = strtol(portString, &end, 10);         Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
  
         //         //
         // Look up the WBEM-HTTPS port number         // Look up the WBEM-HTTPS port number
         //         //
         portNumber = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);          portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);
         sprintf(address, "%u", portNumber);  
     }     }
     else  
       if (enableHttpConnection)
     {     {
         char* end = 0;          String httpPort = configManager->getCurrentValue("httpPort");
         CString portString = httpPort.getCString();         CString portString = httpPort.getCString();
           char* end = 0;
         Uint32 port = strtol(portString, &end, 10);         Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
  
         //         //
         // Look up the WBEM-HTTP port number         // Look up the WBEM-HTTP port number
         //         //
         portNumber = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);          portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);
         sprintf(address, "%u", portNumber);  
     }     }
  
     // Put out startup up message.     // Put out startup up message.
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \ #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
 !defined(PEGASUS_OS_OS400) !defined(PEGASUS_OS_OS400)
     cout << PEGASUS_NAME << PEGASUS_VERSION <<      cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
          " on port " << address << endl;  
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;     cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     cout <<"Starting..."     cout <<"Starting..."
          << (pegasusIOLog ? " Tracing to Log ": " ")          << (pegasusIOLog ? " Tracing to Log ": " ")
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
          << (useSSL ? " Use SSL " : " No SSL ")  
         << endl;         << endl;
 #endif #endif
  
Line 866 
Line 842 
     try     try
     {     {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP) #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)
           char slp_address[32];
         slp_client *discovery = new slp_client() ;;         slp_client *discovery = new slp_client() ;;
         String serviceURL;         String serviceURL;
         serviceURL.assign("service:cim.pegasus://");         serviceURL.assign("service:cim.pegasus://");
         String host_name = slp_get_host_name();         String host_name = slp_get_host_name();
         serviceURL.append(host_name);         serviceURL.append(host_name);
         serviceURL.append(":");         serviceURL.append(":");
         serviceURL.append(address);          // ATTN: Fix this to work for multiple connections
           sprintf(slp_address, "%u",
                   enableHttpConnection ? portNumberHttp : portNumberHttps);
           serviceURL.append(slp_address);
 #endif #endif
  
         Monitor monitor(true);         Monitor monitor(true);
         CIMServer server(&monitor, useSSL);          CIMServer server(&monitor);
  
         // bind throws an exception if the bind fails          if (enableHttpConnection)
           {
               server.addAcceptor(false, portNumberHttp, false);
               Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                           "Listening on HTTP port $0.", portNumberHttp);
           }
           if (enableHttpsConnection)
           {
               server.addAcceptor(false, portNumberHttps, true);
               Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                           "Listening on HTTPS port $0.", portNumberHttps);
           }
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
 #ifdef PEGASUS_OS_OS400          server.addAcceptor(true, 0, false);
         Logger::put(Logger::STANDARD_LOG, "", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                     "Binding to domain socket");                      "Listening on local connection socket.");
 #else  
         cout << "Binding to domain socket" << endl;  
 #endif #endif
 #elif !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  
 #ifdef PEGASUS_OS_OS400  #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400)
         Logger::put(Logger::STANDARD_LOG, "", Logger::INFORMATION,          if (enableHttpConnection)
                     "Binding to domain socket");          {
 #else              cout << "Listening on HTTP port " << portNumberHttp << endl;
         cout << "Binding to " << address << endl;          }
           if (enableHttpsConnection)
           {
               cout << "Listening on HTTPS port " << portNumberHttps << endl;
           }
   # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
           cout << "Listening on local connection socket" << endl;
 #endif #endif
 #endif #endif
  
         server.bind(portNumber);          // bind throws an exception if the bind fails
           server.bind();
  
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         // so user knows that cimserver is ready to serve CIM requests.         // so user knows that cimserver is ready to serve CIM requests.
Line 930 
Line 926 
         // 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, "CIMServer", Logger::INFORMATION,
                     "Started $0 version $1 on port $2.",                      "Started $0 version $1.",
                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION, address);                      PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                     "Started $0 version $1 on port $2.",                      "Started $0 version $1.",
                     PEGASUS_NAME, PEGASUS_VERSION, address);                      PEGASUS_NAME, PEGASUS_VERSION);
 #endif #endif
  
  
Line 969 
Line 965 
         // normal termination         // normal termination
         //         //
         // 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)
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "$0 stopped.", PLATFORM_PRODUCT_NAME);
   #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
             "$0 stopped.", PEGASUS_NAME);             "$0 stopped.", PEGASUS_NAME);
   #endif
  
 #if defined(PEGASUS_OS_HPUX) #if defined(PEGASUS_OS_HPUX)
         //         //
Line 983 
Line 984 
     catch(Exception& e)     catch(Exception& e)
     {     {
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
         Logger::put(Logger::STANDARD_LOG, "", Logger::INFORMATION,          Logger::put(Logger::STANDARD_LOG, "", 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.85  
changed lines
  Added in v.1.86
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2