(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.152 and 1.153

version 1.152, 2005/02/15 22:53:13 version 1.153, 2005/03/03 03:09:40
Line 55 
Line 55 
 // //
 // Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2032 // Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#2032
 // //
   // Modified By: Heather Sterling, IBM (hsterl@us.ibm.com) - PEP#222
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 115 
Line 117 
 #include <fstream> #include <fstream>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/Monitor.h> #include <Pegasus/Common/Monitor.h>
 #include <Pegasus/Server/CIMServer.h>  
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
Line 123 
Line 124 
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
   #include <Pegasus/Server/CIMServer.h>
   #include <Service/ServerProcess.h>
  
 PEGASUS_USING_PEGASUS; PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
 int cimserver_run( int argc, char** argv, Boolean shutdownOption );  #define PEGASUS_PROCESS_NAME "cimserver";
   
 Uint32 parentPid = 0;  
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS)  //Windows service variables are not defined elsewhere in the product
 # include "cimserver_windows.cpp"  //enable ability to override these
 #elif defined(PEGASUS_OS_TYPE_UNIX)  #ifndef PEGASUS_SERVICE_NAME
 # if defined(PEGASUS_OS_OS400)  #define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";
 #  include "vfyptrs.cinc"  
 #  include "OS400ConvertChar.h"  
 #  include "cimserver_os400.cpp"  
 # else  
 #  include "cimserver_unix.cpp"  
 #endif #endif
 #elif defined(PEGASUS_OS_VMS)  #ifndef PEGASUS_SERVICE_DESCRIPTION
 # include "cimserver_vms.cpp"  #define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";
 #else  
 # error "Unsupported platform"  
 #endif #endif
  
   class CIMServerProcess : public ServerProcess
   {
   public:
   
       CIMServerProcess(void)
       {
           cimserver_set_process(this);
       }
   
       virtual ~CIMServerProcess(void)
       {
       }
   
       //defined in PegasusVersion.h
       virtual const char* getProductName() const
       {
           return PEGASUS_PRODUCT_NAME;
       }
   
       virtual const char* getExtendedName() const
       {
           return PEGASUS_SERVICE_NAME;
       }
   
       virtual const char* getDescription() const
       {
           return PEGASUS_SERVICE_DESCRIPTION;
       }
   
       //defined in PegasusVersion.h
       virtual const char* getVersion() const
       {
           return PEGASUS_PRODUCT_VERSION;
       }
   
       virtual const char* getProcessName() const
       {
           return PEGASUS_PROCESS_NAME;
       }
   
       //defined in ConfigFileDir.h
       virtual const char* getPIDFileName() const
       {
           return CIMSERVER_START_FILE;
       }
   
       int cimserver_run(int argc, char** argv, bool shutdownOption);
   
       void cimserver_stop(void);
   };
   
   AutoPtr<CIMServerProcess> _cimServerProcess(new CIMServerProcess());
   static CIMServer* _cimServer = 0;
   
 // //
 //  The command name. //  The command name.
 // //
Line 180 
Line 228 
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
 /** Helper for platform specific handling. So platform specific code  
     can use our single instance of CIMServer.  
 */  
 class CimserverHolder  
 {  
 public:  
         CimserverHolder( CIMServer* s )  
         {  
                 cimserver_set( s );  
         }  
         virtual ~CimserverHolder()  
         {  
                 cimserver_set( 0 );  
         }  
 };  
   
 /** GetOptions function - This function defines the Options Table /** GetOptions function - This function defines the Options Table
     and sets up the options from that table using the config manager.     and sets up the options from that table using the config manager.
 */ */
Line 274 
Line 306 
     usage.append ("                    - sets CIM Server configuration property\n");     usage.append ("                    - sets CIM Server configuration property\n");
  
     cout << endl;     cout << endl;
     cout << PEGASUS_PRODUCT_NAME << " " << PEGASUS_PRODUCT_VERSION << endl;      cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;
     cout << endl;     cout << endl;
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
Line 334 
Line 366 
                     "Unable to connect to CIM Server.  CIM Server may not be running." );                     "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.
         if(cimserver_kill() == -1)      if(_cimServerProcess->cimserver_kill(0) == -1)
            cimserver_exitRC(2);         _cimServerProcess->cimserver_exitRC(2);
         cimserver_exitRC(1);      _cimServerProcess->cimserver_exitRC(1);
 #else #else
         //l10n         //l10n
         //PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);         //PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);
Line 404 
Line 436 
                         "Error in server shutdown: $0", e.getMessage());                         "Error in server shutdown: $0", e.getMessage());
         }         }
         // Kill the server job.         // Kill the server job.
         if(cimserver_kill() == -1)      if(_cimServerProcess->cimserver_kill(0) == -1)
            cimserver_exitRC(2);         _cimServerProcess->cimserver_exitRC(2);
 #else #else
         //l10n - TODO         //l10n - TODO
         MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED",         MessageLoaderParms parms("src.Server.cimserver.SHUTDOWN_FAILED",
Line 434 
Line 466 
         }         }
  
         // Kill the cimserver process         // Kill the cimserver process
         if (cimserver_kill() == 0)      if (_cimServerProcess->cimserver_kill(0) == 0)
         {         {
             //l10n - TODO             //l10n - TODO
             Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,             Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
Line 463 
Line 495 
         // the CIM Server is still running, kill the CIMServer process.         // the CIM Server is still running, kill the CIMServer process.
         //         //
         Uint32 maxWaitTime = timeoutValue - 2;         Uint32 maxWaitTime = timeoutValue - 2;
         Boolean running = isCIMServerRunning();          Boolean running = _cimServerProcess->isCIMServerRunning();
         while ( running && maxWaitTime > 0 )         while ( running && maxWaitTime > 0 )
         {         {
             System::sleep(1);             System::sleep(1);
             running = isCIMServerRunning();              running = _cimServerProcess->isCIMServerRunning();
             maxWaitTime = maxWaitTime - 1;             maxWaitTime = maxWaitTime - 1;
         }         }
  
         if (running)         if (running)
         {         {
            int kill_rc = cimserver_kill();         int kill_rc = _cimServerProcess->cimserver_kill(0);
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
             if(kill_rc == -1)             if(kill_rc == -1)
                 cimserver_exitRC(2);          _cimServerProcess->cimserver_exitRC(2);
             cimserver_exitRC(1);          _cimServerProcess->cimserver_exitRC(1);
 #endif #endif
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \ #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \
Line 576 
Line 608 
 #else #else
  
   // windows only   // windows only
   setHome(pegasusHome);    //setHome(pegasusHome);
     pegasusHome = _cimServerProcess->getHome();
 #endif #endif
  
         // Get help, version, and shutdown options         // Get help, version, and shutdown options
Line 591 
Line 624 
             }             }
             else if(String::equal(arg,"--version"))             else if(String::equal(arg,"--version"))
             {             {
                 cout << PEGASUS_PRODUCT_VERSION << endl;                  cout << _cimServerProcess->getVersion() << endl;
                 exit(0);                 exit(0);
             }             }
             // Check for -option             // Check for -option
Line 606 
Line 639 
                 if (*option == OPTION_VERSION &&                 if (*option == OPTION_VERSION &&
                     strlen(option) == 1)                     strlen(option) == 1)
                 {                 {
                     cout << PEGASUS_PRODUCT_VERSION << endl;                      cout << _cimServerProcess->getVersion() << endl;
                     exit(0);                     exit(0);
                 }                 }
                 //                 //
Line 703 
Line 736 
     // Do the plaform specific run     // Do the plaform specific run
     //     //
  
     return platform_run( argc, argv, shutdownOption );      return _cimServerProcess->platform_run( argc, argv, shutdownOption );
 } }
  
   void CIMServerProcess::cimserver_stop()
   {
       _cimServer->shutdownSignal();
   }
  
 // //
 // The main, common, running code // The main, common, running code
Line 720 
Line 757 
 // specific runs may need to deal with bettter (instead of exit(), etc). // specific runs may need to deal with bettter (instead of exit(), etc).
 // //
  
 int cimserver_run( int argc, char** argv, Boolean shutdownOption )  int CIMServerProcess::cimserver_run( int argc, char** argv, Boolean shutdownOption )
 { {
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean daemonOption = false;     Boolean daemonOption = false;
Line 1002 
Line 1039 
     }     }
 #if defined(PEGASUS_DEBUG) #if defined(PEGASUS_DEBUG)
     // Put out startup up message.     // Put out startup up message.
     cout << PEGASUS_PRODUCT_NAME << " " << PEGASUS_PRODUCT_VERSION << endl;      cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;
     //l10n     //l10n
     //cout << "Built " << __DATE__ << " " << __TIME__ << endl;     //cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     //cout <<"Starting..."     //cout <<"Starting..."
Line 1023 
Line 1060 
     // 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 == _cimServerProcess->cimserver_fork())
 #ifndef PEGASUS_OS_OS400 #ifndef PEGASUS_OS_OS400
         {         {
             return(-1);             return(-1);
Line 1090 
Line 1127 
     // if CIMServer is already running, print message and     // if CIMServer is already running, print message and
     // notify parent process (if there is a parent process) to terminate     // notify parent process (if there is a parent process) to terminate
     //     //
     if(isCIMServerRunning())      if(_cimServerProcess->isCIMServerRunning())
     {     {
         //l10n         //l10n
                 //cout << "Unable to start CIMServer." << endl;                 //cout << "Unable to start CIMServer." << endl;
Line 1103 
Line 1140 
         // 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(1);                  _cimServerProcess->notify_parent(1);
  
         return(1);         return(1);
     }     }
Line 1119 
Line 1156 
  
  
         Monitor monitor;         Monitor monitor;
         CIMServer server(&monitor);      //PEP#222
       //CIMServer server(&monitor);
       //CimserverHolder cimserverHolder( &server );
       _cimServer = new CIMServer(&monitor);
  
         CimserverHolder cimserverHolder( &server );  
  
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false, false);              _cimServer->addAcceptor(false, portNumberHttp, false, false);
             //l10n             //l10n
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         //"Listening on HTTP port $0.", portNumberHttp);                         //"Listening on HTTP port $0.", portNumberHttp);
Line 1136 
Line 1175 
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
             server.addAcceptor(false, portNumberHttps, true, false);              _cimServer->addAcceptor(false, portNumberHttps, true, false);
             //l10n             //l10n
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         //"Listening on HTTPS port $0.", portNumberHttps);                         //"Listening on HTTPS port $0.", portNumberHttps);
Line 1146 
Line 1185 
         }         }
         if (enableSSLExportClientVerification)         if (enableSSLExportClientVerification)
         {         {
             server.addAcceptor(false, portNumberExportHttps, true, true);              _cimServer->addAcceptor(false, portNumberExportHttps, true, true);
  
             Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                 "src.Server.cimserver.LISTENING_ON_EXPORT_HTTPS_PORT",                 "src.Server.cimserver.LISTENING_ON_EXPORT_HTTPS_PORT",
Line 1154 
Line 1193 
         }         }
  
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         server.addAcceptor(true, 0, false, false);          _cimServer->addAcceptor(true, 0, false, false);
         //l10n         //l10n
         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     //"Listening on local connection socket.");                     //"Listening on local connection socket.");
Line 1198 
Line 1237 
 #endif #endif
  
         // bind throws an exception if the bind fails         // bind throws an exception if the bind fails
         server.bind();          _cimServer->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 there is cimserver ready to serve CIM requests.         // so user knows that there is cimserver ready to serve CIM requests.
         if (daemonOption)         if (daemonOption)
                 notify_parent(0);          _cimServerProcess->notify_parent(0);
  
         time_t last = 0;         time_t last = 0;
  
Line 1215 
Line 1254 
         // 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(CIMSERVER_START_FILE);          System::removeFile(_cimServerProcess->getPIDFileName());
  
         // open the file         // open the file
         FILE *pid_file = fopen(CIMSERVER_START_FILE, "w");          FILE *pid_file = fopen(_cimServerProcess->getPIDFileName(), "w");
  
         if (pid_file)         if (pid_file)
         {         {
             // save the pid in the file             // save the pid in the file
             fprintf(pid_file, "%ld\n", (long)server_pid);              fprintf(pid_file, "%ld\n", _cimServerProcess->get_server_pid());
             fclose(pid_file);             fclose(pid_file);
         }         }
 #endif #endif
Line 1237 
Line 1276 
             Logger::INFORMATION,             Logger::INFORMATION,
             "src.Server.cimserver.STARTED_VERSION",             "src.Server.cimserver.STARTED_VERSION",
             "Started $0 version $1.",             "Started $0 version $1.",
             PEGASUS_PRODUCT_NAME, PEGASUS_PRODUCT_VERSION);              _cimServerProcess->getProductName(), _cimServerProcess->getVersion());
  
         //         //
         // 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( !_cimServer->terminated() )
         {         {
  
           server.runForever();        _cimServer->runForever();
  
         }         }
         MessageQueueService::force_shutdown(true);         MessageQueueService::force_shutdown(true);
Line 1257 
Line 1296 
         // Put server shutdown message to the logger         // Put server shutdown message to the logger
         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,
             Logger::INFORMATION, "src.Server.cimserver.STOPPED",             Logger::INFORMATION, "src.Server.cimserver.STOPPED",
             "$0 stopped.", PEGASUS_PRODUCT_NAME);              "$0 stopped.", _cimServerProcess->getProductName());
  
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \ #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \
 || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) \ || defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) \
Line 1266 
Line 1305 
         // 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(CIMSERVER_START_FILE);          FileSystem::removeFile(_cimServerProcess->getPIDFileName());
 #endif #endif
     }     }
     catch(Exception& e)     catch(Exception& e)
Line 1292 
Line 1331 
         // 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(1);                  _cimServerProcess->notify_parent(1);
  
         return 1;         return 1;
     }     }

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