(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / WMIMapper / WMIServer

Diff for /pegasus/src/WMIMapper/WMIServer/cimserver.cpp between version 1.2 and 1.7

version 1.2, 2003/08/15 22:45:40 version 1.7, 2004/01/29 20:57:48
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2003////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
   // IBM Corp.; EMC Corporation, The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 36 
Line 38 
 //                (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)
   //
   // Modified By: Jair Santos, Hewlett-Packard Company (jair.santos@hp.com)
   //
   // Modified By: Dan Gorey (djgorey@us.ibm.com)
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 102 
Line 111 
 #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) && !defined(PEGASUS_NO_SLP)  
 #include <slp/slp.h>  
 #endif  
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # include "cimserver_windows.cpp" # include "cimserver_windows.cpp"
Line 142 
Line 148 
  
 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 166 
Line 179 
  
         cm->mergeCommandLine(argc, argv);         cm->mergeCommandLine(argc, argv);
     }     }
     catch (NoSuchFile nsf)      catch (NoSuchFile&)
     {     {
         throw nsf;          throw;
     }     }
     catch (FileNotReadable fnr)      catch (FileNotReadable&)
     {     {
         throw fnr;          throw;
     }     }
     catch (CannotRenameFile ftrf)      catch (CannotRenameFile&)
     {     {
         throw ftrf;          throw;
     }     }
     catch (ConfigFileSyntaxError cfse)      catch (ConfigFileSyntaxError&)
     {     {
         throw cfse;          throw;
     }     }
     catch(UnrecognizedConfigProperty ucp)      catch(UnrecognizedConfigProperty&)
     {     {
         throw ucp;          throw;
     }     }
     catch(InvalidPropertyValue ipv)      catch(InvalidPropertyValue&)
     {     {
         throw ipv;          throw;
     }     }
 } }
  
Line 212 
Line 225 
     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 ("                      default CIM Server Service Name\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 228 
Line 251 
     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 254 
Line 287 
     }     }
     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(1);
     }     }
  
     try     try
Line 300 
Line 337 
     }     }
     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 310 
Line 363 
         {         {
             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 349 
Line 393 
  
         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 369 
Line 420 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOLog = false;  
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean useSLP = false;     Boolean useSLP = false;
     Boolean daemonOption = false;     Boolean daemonOption = false;
Line 381 
Line 431 
     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 443 
     }     }
  
     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 402 
Line 457 
     else     else
     {     {
         // Get help, version, and shutdown options         // Get help, version, and shutdown options
   
         for (int i = 1; i < argc; )         for (int i = 1; i < argc; )
         {         {
             const char* arg = argv[i];             const char* arg = argv[i];
Line 415 
Line 471 
                 //                 //
                 // 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 427 
Line 484 
                 //                 //
                 // 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 453 
Line 512 
                 //                 //
                 // 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 466 
Line 526 
                 //                 //
                 // 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 495 
Line 556 
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc--;                     argc--;
                 }                 }
   #ifdef PEGASUS_OS_TYPE_WINDOWS
                   else if (strcmp(option, OPTION_INSTALL) == 0)
                   {
                     //
                     // Install as a NT service
                     //
                     char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
   
                     }
                     if(cimserver_install_nt_service(opt_arg))
                     {
                         cout << "\nPegasus installed as NT Service";
                         exit(0);
                     }
                     else
                     {
                         exit(0);
                     }
                   }
                   else if (strcmp(option, OPTION_REMOVE) == 0)
                   {
                     //
                     // Remove Pegasus as an NT service
                     //
                     char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_remove_nt_service(opt_arg))
                     {
                         cout << "\nPegasus removed as NT Service";
                         exit(0);
                     }
                     else
                     {
                         exit(0);
                     }
   
                   }
                   else if (strcmp(option, OPTION_START) == 0)
                   {
                     //
                     // Start as a NT service
                     //
                     char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_start_nt_service(opt_arg))
                     {
                         cout << "\nPegasus started as NT Service";
                         exit(0);
                     }
                     else
                     {
                         exit(0);
                     }
                   }
                   else if (strcmp(option, OPTION_STOP) == 0)
                   {
                     //
                     // Stop as a NT service
                     //
                     char *opt_arg = NULL;
                     if (i+1 < argc)
                     {
                       opt_arg = argv[i+1];
                     }
                     if(cimserver_stop_nt_service(opt_arg))
                     {
                         cout << "\nPegasus stopped as NT Service";
                         exit(0);
                     }
                     else
                     {
                         exit(0);
                     }
                   }
   #endif
                 else                 else
                                         i++;                                         i++;
             }             }
Line 524 
Line 669 
     }     }
     catch (Exception& e)     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;         cerr << argv[0] << ": " << e.getMessage() << endl;
   #endif
         exit(1);         exit(1);
     }     }
  
     // The "SSL" property overrides the enableHttp*Connection properties and  // l10n
     // enables only the HTTPS connection.          // Set the home directory, msg sub-dir, into the MessageLoader.
           // This will be the default directory where the resource bundles
           // are found.
           String messagesDir = String::EMPTY;
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
           messagesDir = OS400_DEFAULT_MESSAGE_SOURCE;
   #else
           messagesDir = ConfigManager::getHomedPath("msg");
   #endif
           MessageLoader::setPegasusMsgHome(messagesDir);
   
     Boolean enableHttpConnection = String::equal(     Boolean enableHttpConnection = String::equal(
                 configManager->getCurrentValue("enableHttpConnection"), "true");                 configManager->getCurrentValue("enableHttpConnection"), "true");
   
         Boolean enableHttpsConnection = String::equal(         Boolean enableHttpsConnection = String::equal(
                 configManager->getCurrentValue("enableHttpsConnection"), "true");                 configManager->getCurrentValue("enableHttpsConnection"), "true");
  
Line 540 
Line 699 
 #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.  "
             "CIMServer will not be started." << endl;             "CIMServer will not be started." << endl;
   
                 exit(1);                 exit(1);
     }     }
 #endif #endif
Line 554 
Line 711 
     try     try
     {     {
         //         //
         // Check to see if we should (can) install as a NT service  
         //  
   
         if (String::equal(configManager->getCurrentValue("install"), "true"))  
         {  
             if( 0 != cimserver_install_nt_service( pegasusHome ))  
             {  
                 cout << "\nPegasus installed as NT Service";  
                 exit(0);  
             }  
         }  
   
         //  
         // Check to see if we should (can) remove Pegasus as an NT service  
         //  
   
         if (String::equal(configManager->getCurrentValue("remove"), "true"))  
         {  
             if( 0 != cimserver_remove_nt_service() )  
             {  
                 cout << "\nPegasus removed as NT Service";  
                 exit(0);  
             }  
         }  
   
         //  
         // Check to see if we should Pegasus as a daemon         // Check to see if we should Pegasus as a daemon
         //         //
  
Line 588 
Line 719 
             daemonOption = true;             daemonOption = true;
         }         }
  
         //  
         // Check the log trace options and set global variable  
         //  
   
         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))  
         {  
             pegasusIOLog = true;  
         }  
   
         // Get the log file directory definition.         // Get the log file directory definition.
         // We put String into Cstring because         // We put String into Cstring because
         // Directory functions only handle Cstring.         // Directory functions only handle Cstring.
         // ATTN-KS: create String based directory functions.         // ATTN-KS: create String based directory functions.
  
         logsDirectory = configManager->getCurrentValue("logdir");         logsDirectory = configManager->getCurrentValue("logdir");
         logsDirectory = ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));          logsDirectory =
               ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));
  
         // Set up the Logger. This does not open the logs         // Set up the Logger. This does not open the logs
         // 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 624 
Line 748 
  
             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);
         }         }
  
         // 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;
         }         }
     }     }
     catch (UnrecognizedConfigProperty e)      catch (UnrecognizedConfigProperty& e)
     {     {
   
   #ifdef PEGASUS_OS_OS400
           Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                       "Error: $0",e.getMessage());
   #else
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
   #endif
     }     }
  
     Uint32 portNumberHttps;     Uint32 portNumberHttps;
Line 683 
Line 811 
     }     }
  
     // 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)
     cout << PEGASUS_NAME << PEGASUS_VERSION << 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 ")
              << endl;              << endl;
 #endif #endif
   
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
     {     {
         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 709 
Line 845 
     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 730 
Line 868 
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         //         //
         if (daemonOption)         if (daemonOption)
                 notify_parent();                  notify_parent(1);
  
         exit(1);         exit(1);
     }     }
Line 740 
Line 878 
     // 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) && ! defined(PEGASUS_NO_SLP)          #ifdef PEGASUS_USE_23HTTPMONITOR
                 char slp_address[32];  
         slp_client *discovery = new slp_client() ;;  
         String serviceURL;  
                 serviceURL.assign("service:cim.pegasus://");  
                 String host_name = slp_get_host_name();  
                 serviceURL.append(host_name);  
                 serviceURL.append(":");  
         // ATTN: Fix this to work for multiple connections  
         sprintf(slp_address,  
                                 "%u",  
                 enableHttpConnection ? portNumberHttp : portNumberHttps);  
                 serviceURL.append(slp_address);  
 #endif  
                 Monitor monitor(true);                 Monitor monitor(true);
           #else
           monitor_2 monitor();
           #endif
                 CIMServer server(&monitor);                 CIMServer server(&monitor);
  
         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, System::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
  
 #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)
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             cout << "Listening on HTTP port " << portNumberHttp << endl;             cout << "Listening on HTTP port " << portNumberHttp << endl;
Line 793 
Line 921 
                 server.bind();                 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 there is cimserver ready to serve CIM requests.
                 if (daemonOption)                 if (daemonOption)
                         notify_parent();                  notify_parent(0);
  
                 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 817 
Line 945 
             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.",                     "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
  
   
                 //                 //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown
         //         //
                 while(!server.terminated())                 while(!server.terminated())
                 {                 {
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)  
                         if(useSLP)  
                         {  
                                 if((time(NULL) - last) > 60)  
                                 {  
                                         if(discovery != NULL && serviceURL.size())  
                                                 discovery->srv_reg_all(serviceURL.getCString(),  
                                                                                            "(namespace=root/cimv2)",  
                                                                                            "service:cim.pegasus",  
                                                                                            "DEFAULT",  
                                                                                            70) ;  
                                         time(&last);  
                                 }  
   
                                 discovery->service_listener();  
                         }  
 #endif  
                         server.runForever();                         server.runForever();
                 }                 }
  
Line 863 
Line 977 
                 //                 //
         // 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
  
 #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)
     {     {
                 PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);          Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,  
             "Error: $0", e.getMessage());             "Error: $0", e.getMessage());
  
   #ifndef PEGASUS_OS_OS400
           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
         //         //
         if (daemonOption)         if (daemonOption)
                         notify_parent();                  notify_parent(1);
  
         return 1;         return 1;
     }     }

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