(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.81.4.1 and 1.82

version 1.81.4.1, 2002/12/04 17:54:04 version 1.82, 2003/01/25 14:41:32
Line 214 
Line 214 
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");
     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");
       usage.append ("    -start    - starts pegasus as a Windows NT Service\n");
       usage.append ("    -stop     - stops pegasus as a Windows NT Service\n");
 #endif #endif
     usage.append ("  configProperty=value\n");     usage.append ("  configProperty=value\n");
     usage.append ("                - sets CIM Server configuration property\n");     usage.append ("                - sets CIM Server configuration property\n");
Line 370 
Line 372 
 { {
     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 381 
Line 386 
     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;
 #endif #endif
  
   #ifndef PEGASUS_OS_TYPE_WINDOWS
     //     //
     // Get environment variables:     // Get environment variables:
     //     //
Line 392 
Line 398 
     }     }
  
     FileSystem::translateSlashes(pegasusHome);     FileSystem::translateSlashes(pegasusHome);
   #else
  
     // windows only
     setHome(pegasusHome);
   #endif
     // on Windows NT if there are no command-line options, run as a service     // on Windows NT if there are no command-line options, run as a service
  
     if (argc == 1 )     if (argc == 1 )
Line 467 
Line 477 
                 //                 //
                 // Check to see if user asked for shutdown (-s option):                 // Check to see if user asked for shutdown (-s option):
                 //                 //
                 else if (*option == OPTION_SHUTDOWN)                  else if (*option == OPTION_SHUTDOWN &&
                           (strlen(option) == 1))
                 {                 {
                     //                     //
                     // check to see if user is root                     // check to see if user is root
Line 529 
Line 540 
         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
     {     {
         //         //
         // Check to see if we should (can) install as a NT service         // Check to see if we should (can) install as a NT service
         //         //
   
         if (String::equal(configManager->getCurrentValue("install"), "true"))         if (String::equal(configManager->getCurrentValue("install"), "true"))
         {         {
             if( 0 != cimserver_install_nt_service( pegasusHome ))              if(cimserver_install_nt_service())
             {             {
                 cout << "\nPegasus installed as NT Service";                 cout << "\nPegasus installed as NT Service";
                 exit(0);                 exit(0);
             }             }
               else
               {
                   exit(0);
               }
         }         }
  
         //         //
Line 572 
Line 564 
  
         if (String::equal(configManager->getCurrentValue("remove"), "true"))         if (String::equal(configManager->getCurrentValue("remove"), "true"))
         {         {
             if( 0 != cimserver_remove_nt_service() )              if(cimserver_remove_nt_service())
             {             {
                 cout << "\nPegasus removed as NT Service";                 cout << "\nPegasus removed as NT Service";
                 exit(0);                 exit(0);
             }             }
               else
               {
                   exit(0);
               }
   
           }
   
           //
           // Check to see if we should (can) start as a NT service
           //
           if (String::equal(configManager->getCurrentValue("start"), "true"))
           {
               if(cimserver_start_nt_service())
               {
                   cout << "\nPegasus started as NT Service";
                   exit(0);
               }
               else
               {
                   exit(0);
               }
           }
   
           //
           // Check to see if we should (can) stop as a NT service
           //
           if (String::equal(configManager->getCurrentValue("stop"), "true"))
           {
               if(cimserver_stop_nt_service())
               {
                   cout << "\nPegasus stopped as NT Service";
                   exit(0);
               }
               else
               {
                   exit(0);
               }
         }         }
  
         //         //
Line 632 
Line 661 
             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)
         cout << "Logs Directory = " << logsDirectory << endl;         cout << "Logs Directory = " << logsDirectory << endl;
Line 646 
Line 683 
         {         {
             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)
     {     {
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
     }     }
  
     Uint32 portNumberHttps;      Uint32 portNumber;
     Uint32 portNumberHttp;  
  
     if (enableHttpsConnection)      char address[32];
   
       if (useSSL)
     {     {
         String httpsPort = configManager->getCurrentValue("httpsPort");  
         CString portString = httpsPort.getCString();  
         char* end = 0;         char* end = 0;
           CString portString = httpsPort.getCString();
         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
         //         //
         portNumberHttps = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);          portNumber = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);
           sprintf(address, "%u", portNumber);
     }     }
       else
     if (enableHttpConnection)  
     {     {
         String httpPort = configManager->getCurrentValue("httpPort");  
         CString portString = httpPort.getCString();  
         char* end = 0;         char* end = 0;
           CString portString = httpPort.getCString();
         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
         //         //
         portNumberHttp = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);          portNumber = 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)
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;      cout << PEGASUS_NAME << PEGASUS_VERSION <<
            " 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 743 
Line 815 
     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(":");
         // ATTN: Fix this to work for multiple connections          serviceURL.append(address);
         sprintf(slp_address, "%u",  
                 enableHttpConnection ? portNumberHttp : portNumberHttps);  
         serviceURL.append(slp_address);  
 #endif #endif
  
         Monitor monitor(true);         Monitor monitor(true);
         CIMServer server(&monitor);          CIMServer server(&monitor, useSSL);
  
         if (enableHttpConnection)          // bind throws an exception if the bind fails
         {  
             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  
         server.addAcceptor(true, 0, false);  
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
                     "Listening on local connection socket.");  
 #endif  
   
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  
         if (enableHttpConnection)  
         {  
             cout << "Listening on HTTP port " << portNumberHttp << endl;  
         }  
         if (enableHttpsConnection)  
         {  
             cout << "Listening on HTTPS port " << portNumberHttps << endl;  
         }  
 # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         cout << "Listening on local connection socket" << endl;          cout << "Binding to domain socket" << endl;
 # endif  #elif !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
           cout << "Binding to " << address << endl;
 #endif #endif
  
         // bind throws an exception if the bind fails          server.bind(portNumber);
         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 826 
Line 868 
         // 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.",                      "Started $0 version $1 on port $2.",
                     PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION);                      PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION, address);
 #else #else
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                     "Started $0 version $1.",                      "Started $0 version $1 on port $2.",
                     PEGASUS_NAME, PEGASUS_VERSION);                      PEGASUS_NAME, PEGASUS_VERSION, address);
 #endif #endif
  
  
Line 865 
Line 907 
         // 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 884 
Line 921 
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
             "Error: $0", e.getMessage());  
  
         //         //
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate

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