(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.82 and 1.93

version 1.82, 2003/01/25 14:41:32 version 1.93, 2003/05/27 21:37:03
Line 36 
Line 36 
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
 //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com) //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)
 // //
   // Modified By: Dave Rosckes (rosckes@us.ibm.com)
   //
   // Modified By: Humberto Rivero (hurivero@us.ibm.com)
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 142 
Line 146 
  
 static const char OPTION_SHUTDOWN    = 's'; static const char OPTION_SHUTDOWN    = 's';
  
   static const char OPTION_INSTALL[]   = "install";
   
   static const char OPTION_REMOVE[]   = "remove";
   
   static const char OPTION_START[]   = "start";
   
   static const char OPTION_STOP[]   = "stop";
   
 #if defined(PEGASUS_OS_HPUX) #if defined(PEGASUS_OS_HPUX)
 static const char OPTION_BINDVERBOSE = 'X'; static const char OPTION_BINDVERBOSE = 'X';
 #endif #endif
  
 static const String PROPERTY_TIMEOUT = "shutdownTimeout"; static const String PROPERTY_TIMEOUT = "shutdownTimeout";
 static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";  
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
Line 212 
Line 223 
     usage.append ("    -D [home]   - sets pegasus home directory\n");     usage.append ("    -D [home]   - sets pegasus home directory\n");
 #endif #endif
 #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 [name] - installs pegasus as a Windows NT Service\n");
     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");      usage.append ("                      [name] is optional and overrides the\n");
     usage.append ("    -start    - starts pegasus as a Windows NT Service\n");      usage.append ("                      default CIM Server Service Name\n");
     usage.append ("    -stop     - stops pegasus as a Windows NT Service\n");      usage.append ("    -remove [name]  - removes pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n");
       usage.append ("    -start [name]   - starts pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n");
       usage.append ("    -stop [name]    - stops pegasus as a Windows NT Service\n");
       usage.append ("                      [name] is optional and overrides the\n");
       usage.append ("                      default CIM Server Service Name\n\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 230 
Line 249 
     cout << usage << endl;     cout << usage << endl;
 } }
  
   //
   // cimserver_exit: platform specific exit routine calls
   //
   void cimserver_exit( int rc ){
   #ifdef PEGASUS_OS_OS400
       cimserver_exitRC(rc);
   #endif
       exit(rc);
   }
   
 void shutdownCIMOM(Uint32 timeoutValue) void shutdownCIMOM(Uint32 timeoutValue)
 { {
     //     //
Line 256 
Line 285 
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);  
         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "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.
         cimserver_kill();          if(cimserver_kill() == -1)
         return;             cimserver_exit(2);
           cimserver_exit(1);
   #else
           PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);
           PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);
 #endif #endif
         exit(0);          cimserver_exit(0);
     }     }
  
     try     try
Line 302 
Line 335 
     }     }
     catch(CIMException& e)     catch(CIMException& e)
     {     {
   #ifdef PEGASUS_OS_OS400
   
           if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
           {
               Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "Failed to shutdown server: $0", "The repository may be empty.");
           }
           else
           {
               Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "Failed to shutdown server: $0", e.getMessage());
           }
           // Kill the server job.
           if(cimserver_kill() == -1)
              cimserver_exit(2);
   #else
         PEGASUS_STD(cerr) << "Failed to shutdown server: ";         PEGASUS_STD(cerr) << "Failed to shutdown server: ";
         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)         if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
         {         {
Line 312 
Line 361 
         {         {
             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);             PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
         }         }
 #ifdef PEGASUS_OS_OS400  
         // Kill the server job.  
         cimserver_kill();  
         return;  
 #endif #endif
         exit(1);          cimserver_exit(1);
   
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         //         //
         // This may mean the CIM Server has been terminated and returns a          // This may mean that the CIM Server has terminated, causing this
         // "Empty HTTP response message" HTTP error response.  To be sure          // client to get a "Empty HTTP response message" exception.  It may
         // CIM Server gets shutdown, if CIM Server is still running at          // also mean that the CIM Server is taking longer than 2 seconds
         // this time, we will kill the cimserver process.          // (client timeout value) to terminate, causing this client to
         //          // timeout with a "connection timeout" exception.
         // give CIM Server some time to finish up  
         //  
         //System::sleep(1);  
         //cimserver_kill();  
   
         //         //
         // Check to see if CIMServer is still running.  If CIMServer         // Check to see if CIMServer is still running.  If CIMServer
         // is still running and the shutdown timeout has not expired,         // is still running and the shutdown timeout has not expired,
         // loop and wait one second until either CIM Server is          // loop and wait one second until either the CIM Server is
         // terminated or until timeout expires.  If timeout expires          // terminated or timeout expires.  If timeout expires and
         // and CIMServer is still running, kill the CIMServer          // the CIM Server is still running, kill the CIMServer process.
         // process.  
         //         //
         Uint32 maxWaitTime = timeoutValue - 2;         Uint32 maxWaitTime = timeoutValue - 2;
         Boolean running = isCIMServerRunning();         Boolean running = isCIMServerRunning();
Line 351 
Line 391 
  
         if (running)         if (running)
         {         {
             cimserver_kill();              int kill_rc = cimserver_kill();
   #ifdef PEGASUS_OS_OS400
               if(kill_rc == -1)
                   cimserver_exit(2);
               cimserver_exit(1);
   #endif
   
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
               if (kill_rc != -1)
               {
                   cout << "Shutdown timeout expired.  CIM Server process killed." << endl;
                   exit(0);
               }
   #endif
         }         }
     }     }
     //catch(Exception& e)  
     //{  
     //    PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";  
     //    PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);  
     //    exit(1);  
     //}  
  
     return;     return;
 } }
Line 371 
Line 418 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     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 426 
Line 469 
                 //                 //
                 // Check to see if user asked for the version (-v option):                 // Check to see if user asked for the version (-v option):
                 //                 //
                 if (*option == OPTION_VERSION)                  if (*option == OPTION_VERSION &&
                       strlen(option) == 1)
                 {                 {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
                     cout << PLATFORM_PRODUCT_VERSION << endl;                     cout << PLATFORM_PRODUCT_VERSION << endl;
Line 438 
Line 482 
                 //                 //
                 // Check to see if user asked for help (-h option):                 // Check to see if user asked for help (-h option):
                 //                 //
                 else if (*option == OPTION_HELP)                  else if (*option == OPTION_HELP &&
                           (strlen(option) == 1))
                 {                 {
                     PrintHelp(argv[0]);                     PrintHelp(argv[0]);
                     exit(0);                     exit(0);
                 }                 }
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
                 else if (*option == OPTION_HOME)                  else if (*option == OPTION_HOME &&
                           (strlen(option) == 1))
                 {                 {
                     if (i + 1 < argc)                     if (i + 1 < argc)
                     {                     {
Line 464 
Line 510 
                 //                 //
                 // Check to see if user asked for the version (-X option):                 // Check to see if user asked for the version (-X option):
                 //                 //
                 if (*option == OPTION_BINDVERBOSE)                  if (*option == OPTION_BINDVERBOSE &&
                           (strlen(option) == 1))
                 {                 {
                     System::bindVerbose = true;                     System::bindVerbose = true;
                     cout << "Unsupported debug option, BIND_VERBOSE, enabled."                     cout << "Unsupported debug option, BIND_VERBOSE, enabled."
Line 507 
Line 554 
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc--;                     argc--;
                 }                 }
                 else  #ifdef PEGASUS_OS_TYPE_WINDOWS
                     i++;                  else if (strcmp(option, OPTION_INSTALL) == 0)
             }  
             else  
                 i++;  
         }  
     }  
   
     //  
     // Set the value for pegasusHome property  
     //  
     ConfigManager::setPegasusHome(pegasusHome);  
   
     //  
     // Get an instance of the Config Manager.  
     //  
     configManager = ConfigManager::getInstance();  
   
     //  
     // Get options (from command line and from configuration file); this  
     // removes corresponding options and their arguments from the command  
     // line.  
     //  
     try  
     {  
         GetOptions(configManager, argc, argv, pegasusHome);  
     }  
     catch (Exception& e)  
     {  
         cerr << argv[0] << ": " << e.getMessage() << endl;  
         exit(1);  
     }  
   
     try  
     {     {
         //         //
         // Check to see if we should (can) install as a NT service                    // Install as a NT service
         //         //
         if (String::equal(configManager->getCurrentValue("install"), "true"))                    char *opt_arg = NULL;
                     if (i+1 < argc)
         {         {
             if(cimserver_install_nt_service())                      opt_arg = argv[i+1];
   
                     }
                     if(cimserver_install_nt_service(opt_arg))
             {             {
                 cout << "\nPegasus installed as NT Service";                 cout << "\nPegasus installed as NT Service";
                 exit(0);                 exit(0);
Line 557 
Line 576 
                 exit(0);                 exit(0);
             }             }
         }         }
                   else if (strcmp(option, OPTION_REMOVE) == 0)
                   {
         //         //
         // Check to see if we should (can) remove Pegasus as an NT service                    // Remove Pegasus as an NT service
         //         //
                     char *opt_arg = NULL;
         if (String::equal(configManager->getCurrentValue("remove"), "true"))                    if (i+1 < argc)
         {         {
             if(cimserver_remove_nt_service())                      opt_arg = argv[i+1];
                     }
                     if(cimserver_remove_nt_service(opt_arg))
             {             {
                 cout << "\nPegasus removed as NT Service";                 cout << "\nPegasus removed as NT Service";
                 exit(0);                 exit(0);
Line 575 
Line 597 
             }             }
  
         }         }
                   else if (strcmp(option, OPTION_START) == 0)
                   {
         //         //
         // Check to see if we should (can) start as a NT service                    // Start as a NT service
         //         //
         if (String::equal(configManager->getCurrentValue("start"), "true"))                    char *opt_arg = NULL;
                     if (i+1 < argc)
         {         {
             if(cimserver_start_nt_service())                      opt_arg = argv[i+1];
                     }
                     if(cimserver_start_nt_service(opt_arg))
             {             {
                 cout << "\nPegasus started as NT Service";                 cout << "\nPegasus started as NT Service";
                 exit(0);                 exit(0);
Line 591 
Line 617 
                 exit(0);                 exit(0);
             }             }
         }         }
                   else if (strcmp(option, OPTION_STOP) == 0)
                   {
         //         //
         // Check to see if we should (can) stop as a NT service                    // Stop as a NT service
         //         //
         if (String::equal(configManager->getCurrentValue("stop"), "true"))                    char *opt_arg = NULL;
                     if (i+1 < argc)
         {         {
             if(cimserver_stop_nt_service())                      opt_arg = argv[i+1];
                     }
                     if(cimserver_stop_nt_service(opt_arg))
             {             {
                 cout << "\nPegasus stopped as NT Service";                 cout << "\nPegasus stopped as NT Service";
                 exit(0);                 exit(0);
Line 607 
Line 637 
                 exit(0);                 exit(0);
             }             }
         }         }
   #endif
                   else
                       i++;
               }
               else
                   i++;
           }
       }
  
         //         //
         // Check to see if we should Pegasus as a daemon      // Set the value for pegasusHome property
       //
       ConfigManager::setPegasusHome(pegasusHome);
   
       //
       // Get an instance of the Config Manager.
         //         //
       configManager = ConfigManager::getInstance();
  
         if (String::equal(configManager->getCurrentValue("daemon"), "true"))      //
       // Get options (from command line and from configuration file); this
       // removes corresponding options and their arguments from the command
       // line.
       //
       try
         {         {
             daemonOption = true;          GetOptions(configManager, argc, argv, pegasusHome);
       }
       catch (Exception& e)
       {
   #ifdef PEGASUS_OS_OS400
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                           "$0: $1",argv[0] ,e.getMessage());
   #else
           cerr << argv[0] << ": " << e.getMessage() << endl;
   #endif
           exit(1);
         }         }
  
       Boolean enableHttpConnection = String::equal(
           configManager->getCurrentValue("enableHttpConnection"), "true");
       Boolean enableHttpsConnection = String::equal(
           configManager->getCurrentValue("enableHttpsConnection"), "true");
   
       // Make sure at least one connection is enabled
   #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
       if (!enableHttpConnection && !enableHttpsConnection)
       {
           Logger::put(Logger::STANDARD_LOG, System::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
       {
         //         //
         // Check the log trace options and set global variable          // Check to see if we should Pegasus as a daemon
         //         //
  
         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))          if (String::equal(configManager->getCurrentValue("daemon"), "true"))
         {         {
             pegasusIOLog = true;              daemonOption = true;
         }         }
  
         // Get the log file directory definition.         // Get the log file directory definition.
Line 639 
Line 718 
         // Might be more logical to clean before set.         // Might be more logical to clean before set.
         // ATTN: Need tool to completely disable logging.         // ATTN: Need tool to completely disable logging.
  
 #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)
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
 #endif #endif
  
Line 654 
Line 734 
  
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
             cout << "CIM Server stopped." << endl;  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
             return(0);              Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,
                           "CIM Server stopped.");
   #else
               cout << "CIM Server stopped." << endl;
 #endif #endif
             exit(0);              cimserver_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)
         cout << "Logs Directory = " << logsDirectory << endl;         cout << "Logs Directory = " << logsDirectory << endl;
 #endif #endif
  
         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))  
         {  
             Logger::clean(logsDirectory);;  
         }  
   
         if (String::equal(configManager->getCurrentValue("slp"), "true"))         if (String::equal(configManager->getCurrentValue("slp"), "true"))
         {         {
             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)      catch (UnrecognizedConfigProperty e)
         {         {
             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;  
  
   #ifdef PEGASUS_OS_OS400
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "Error: $0",e.getMessage());
 #else #else
         if (String::equal(configManager->getCurrentValue("SSL"), "true"))  
         {  
             useSSL =  true;  
         }  
 #endif  
     }  
     catch (UnrecognizedConfigProperty e)  
     {  
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
   #endif
     }     }
  
     Uint32 portNumber;      Uint32 portNumberHttps;
       Uint32 portNumberHttp;
     char address[32];  
  
     if (useSSL)      if (enableHttpsConnection)
     {     {
         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) && \
     cout << PEGASUS_NAME << PEGASUS_VERSION <<  !defined(PEGASUS_OS_OS400)
          " on port " << address << endl;      cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;     cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     cout <<"Starting..."     cout <<"Starting..."
          << (pegasusIOLog ? " Tracing to Log ": " ")  
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
          << (useSSL ? " Use SSL " : " No SSL ")  
         << endl;         << endl;
 #endif #endif
  
Line 770 
Line 811 
     {     {
         if(-1 == cimserver_fork())         if(-1 == cimserver_fork())
 #ifndef PEGASUS_OS_OS400 #ifndef PEGASUS_OS_OS400
           {
           exit(-1);           exit(-1);
           }
 #else #else
           {
           return(-1);           return(-1);
           }
         else         else
           {
           return(0);           return(0);
           }
 #endif #endif
   
     }     }
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
Line 783 
Line 831 
     if (cimserver_initialize() != 0)     if (cimserver_initialize() != 0)
     {     {
        // do some logging here!        // do some logging here!
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "CIM Server failed to initialize");
        exit(-1);        exit(-1);
     }     }
 #endif #endif
  
 #ifdef PEGASUS_OS_HPUX  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
     umask(S_IWGRP|S_IWOTH);     umask(S_IWGRP|S_IWOTH);
  
     //     //
Line 815 
Line 865 
     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, System::CIMSERVER, Logger::INFORMATION,
                           "Listening on HTTP port $0.", portNumberHttp);
           }
           if (enableHttpsConnection)
           {
               server.addAcceptor(false, portNumberHttps, true);
               Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                           "Listening on HTTPS port $0.", portNumberHttps);
           }
   #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
           server.addAcceptor(true, 0, false);
           Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                       "Listening on local connection socket.");
   #endif
   
   #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && !defined(PEGASUS_OS_OS400)
           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 << "Binding to domain socket" << endl;          cout << "Listening on local connection socket" << endl;
 #elif !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  # endif
         cout << "Binding to " << address << endl;  
 #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 843 
Line 923 
  
         time_t last = 0;         time_t last = 0;
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
         //         //
         // create a file to indicate that the cimserver has started and         // create a file to indicate that the cimserver has started and
         // save the process id of the cimserver process in the file         // save the process id of the cimserver process in the file
         //         //
   
         // remove the old file if it exists         // remove the old file if it exists
         System::removeFile(fname);          System::removeFile(CIMSERVER_START_FILE);
  
         // open the file         // open the file
         FILE *pid_file = fopen(fname, "w");          FILE *pid_file = fopen(CIMSERVER_START_FILE, "w");
   
         if (pid_file)         if (pid_file)
         {         {
             // save the pid in the file             // save the pid in the file
Line 861 
Line 941 
             fclose(pid_file);             fclose(pid_file);
         }         }
 #endif #endif
 #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)
         cout << "Started. " << endl;         cout << "Started. " << endl;
 #endif #endif
  
         // 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 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, System::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 907 
Line 989 
         // normal termination         // normal termination
         //         //
         // Put server shutdown message to the logger         // Put server shutdown message to the logger
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)
           Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
               "$0 stopped.", PLATFORM_PRODUCT_NAME);
   #else
           Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
             "$0 stopped.", PEGASUS_NAME);             "$0 stopped.", PEGASUS_NAME);
   #endif
  
 #if defined(PEGASUS_OS_HPUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
         //         //
         // close the file created at startup time to indicate that the         // close the file created at startup time to indicate that the
         // cimserver has terminated normally.         // cimserver has terminated normally.
         //         //
         FileSystem::removeFile(CIMSERVERSTART_FILE);          FileSystem::removeFile(CIMSERVER_START_FILE);
 #endif #endif
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
   #ifdef PEGASUS_OS_OS400
           Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                       "Error: $0", e.getMessage());
   #else
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
   #endif
  
         //         //
         // 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.82  
changed lines
  Added in v.1.93
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2