(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.72 and 1.78

version 1.72, 2002/09/13 21:40:43 version 1.78, 2002/10/09 22:05:02
Line 34 
Line 34 
 // Modified By: Sushma Fernandes (sushma_fernandes@hp.com) // Modified By: Sushma Fernandes (sushma_fernandes@hp.com)
 //              Carol Ann Krug Graves, Hewlett-Packard Company //              Carol Ann Krug Graves, Hewlett-Packard Company
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
   //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 100 
Line 101 
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
 #include <Pegasus/Common/Destroyer.h> #include <Pegasus/Common/Destroyer.h>
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)
 #include <slp/slp.h> #include <slp/slp.h>
 #endif #endif
  
Line 630 
Line 631 
             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"))         if (String::equal(configManager->getCurrentValue("SSL"), "true"))
         {         {
             useSSL =  true;             useSSL =  true;
         }         }
   #endif
     }     }
     catch (UnrecognizedConfigProperty e)     catch (UnrecognizedConfigProperty e)
     {     {
Line 706 
Line 735 
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
     {     {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)
         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://");
Line 728 
Line 757 
  
         server.bind(portNumber);         server.bind(portNumber);
  
           // notify parent process (if there is a parent process) to terminate
           // so user knows that cimserver is ready to serve CIM requests.
           if (daemonOption)
                   notify_parent();
   
         time_t last = 0;         time_t last = 0;
  
 #if defined(PEGASUS_OS_HPUX) #if defined(PEGASUS_OS_HPUX)
Line 770 
Line 804 
         //         //
         while( !server.terminated() )         while( !server.terminated() )
         {         {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)
           if(useSLP  )           if(useSLP  )
           {           {
             if(  (time(NULL) - last ) > 60 )             if(  (time(NULL) - last ) > 60 )
Line 808 
Line 842 
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
   
           //
           // notify parent process (if there is a parent process) to terminate
           //
           if (daemonOption)
                   notify_parent();
   
         return 1;         return 1;
     }     }
  


Legend:
Removed from v.1.72  
changed lines
  Added in v.1.78

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2