(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.211.2.15 and 1.212

version 1.211.2.15, 2007/11/05 01:47:24 version 1.212, 2007/10/22 15:00:00
Line 89 
Line 89 
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/LanguageParser.h> #include <Pegasus/Common/LanguageParser.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
   #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/CIMServer.h> #include <Pegasus/Server/CIMServer.h>
 #include <Service/ServerProcess.h> #include <Service/ServerProcess.h>
 #include <Service/ServerRunStatus.h>  
   
 #if !defined(PEGASUS_REMOVE_SERVER_CLIENT_USAGE)  
 # include <Pegasus/Client/CIMClient.h>  
 # include <Service/ServerShutdownClient.h> # include <Service/ServerShutdownClient.h>
 #endif  #include <Service/ServerRunStatus.h>
  
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
 #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h> #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h>
Line 108 
Line 105 
 # endif # endif
 #endif #endif
  
 #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VXWORKS)  #if defined(PEGASUS_OS_TYPE_UNIX)
 # include <unistd.h> # include <unistd.h>
 # include <sys/types.h> # include <sys/types.h>
 # include <sys/stat.h> # include <sys/stat.h>
Line 144 
Line 141 
 #include <as400_protos.h> //for _SETCCSID #include <as400_protos.h> //for _SETCCSID
 #endif #endif
  
 class PEGASUS_SERVER_LINKAGE CIMServerProcess : public ServerProcess  class CIMServerProcess : public ServerProcess
 { {
 public: public:
  
Line 248 
Line 245 
     char** argv,     char** argv,
     Boolean shutdownOption)     Boolean shutdownOption)
 { {
 #if defined(PEGASUS_OS_VXWORKS)  
   
     // VxWorks does not use configuration files.  
   
     cm->mergeCommandLine(argc, argv);  
   
 #else /* PEGASUS_OS_VXWORKS */  
   
     if (shutdownOption)     if (shutdownOption)
     {     {
         cm->loadConfigFiles();         cm->loadConfigFiles();
Line 273 
Line 262 
  
     // Enable updates again     // Enable updates again
     cm->useConfigFiles = true;     cm->useConfigFiles = true;
   
 #endif /* PEGASUS_OS_VXWORKS */  
 } }
  
 /* PrintHelp - This is temporary until we expand the options manager to allow /* PrintHelp - This is temporary until we expand the options manager to allow
Line 442 
Line 429 
 //  MAIN //  MAIN
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
  
 extern "C" int PegasusServerMain(int argc, char** argv)  int main(int argc, char** argv)
 { {
     String pegasusHome;     String pegasusHome;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
Line 705 
Line 692 
     // Get an instance of the Config Manager.     // Get an instance of the Config Manager.
     //     //
     ConfigManager* configManager = ConfigManager::getInstance();     ConfigManager* configManager = ConfigManager::getInstance();
   
 #if !defined(PEGASUS_OS_VXWORKS)  
     configManager->useConfigFiles = true;     configManager->useConfigFiles = true;
 #endif  
  
     try     try
     {     {
Line 779 
Line 763 
         //         //
         // Check to see if we should start Pegasus as a daemon         // Check to see if we should start Pegasus as a daemon
         //         //
   
         daemonOption = ConfigManager::parseBooleanValue(         daemonOption = ConfigManager::parseBooleanValue(
             configManager->getCurrentValue("daemon"));             configManager->getCurrentValue("daemon"));
  
Line 802 
Line 785 
 #endif #endif
  
     //     //
     // Some platforms do not support using client to shutdown server.  
     //  
 #if !defined(PEGASUS_REMOVE_SERVER_CLIENT_USAGE)  
         //  
         // Check to see if we need to shutdown CIMOM         // Check to see if we need to shutdown CIMOM
         //         //
         if (shutdownOption)         if (shutdownOption)
Line 814 
Line 793 
                 configManager->getCurrentValue("shutdownTimeout");                 configManager->getCurrentValue("shutdownTimeout");
             Uint32 timeoutValue =             Uint32 timeoutValue =
                 strtol(configTimeout.getCString(), (char **)0, 10);                 strtol(configTimeout.getCString(), (char **)0, 10);
 # ifdef PEGASUS_SLP_REG_TIMEOUT  
             // To deregister Pegasus with SLP  
             unregisterPegasusFromSLP();  
 # endif  
  
             ServerShutdownClient serverShutdownClient(&_serverRunStatus);             ServerShutdownClient serverShutdownClient(&_serverRunStatus);
             serverShutdownClient.shutdown(timeoutValue);             serverShutdownClient.shutdown(timeoutValue);
Line 829 
Line 804 
             cout << MessageLoader::getMessage(parms) << endl;             cout << MessageLoader::getMessage(parms) << endl;
             return 0;             return 0;
         }         }
 #endif /* PEGASUS_REMOVE_SERVER_CLIENT_USAGE */  
  
 #if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS) #if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS)
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
Line 900 
Line 874 
             e.getMessage());             e.getMessage());
     }     }
  
 #if !defined(PEGASUS_OS_TYPE_WINDOWS) && !defined(PEGASUS_OS_VXWORKS)  #ifndef PEGASUS_OS_TYPE_WINDOWS
     umask(S_IRWXG|S_IRWXO);     umask(S_IRWXG|S_IRWXO);
 #endif #endif
  
Line 909 
Line 883 
     try     try
     {     {
 #if defined(PEGASUS_OS_TYPE_UNIX) #if defined(PEGASUS_OS_TYPE_UNIX)
   
         // ATTN KS This file not used for VxWorks  
         //         //
         // Lock the CIMSERVER_LOCK_FILE during CIM Server start-up to prevent         // Lock the CIMSERVER_LOCK_FILE during CIM Server start-up to prevent
         // concurrent writes to this file by multiple cimserver processes         // concurrent writes to this file by multiple cimserver processes
Line 929 
Line 901 
         AutoFileLock fileLock(startupLockFileName);         AutoFileLock fileLock(startupLockFileName);
 #endif #endif
  
 #if defined(PEGASUS_OS_TYPE_UNIX) || \  #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)
     defined(PEGASUS_OS_VMS) || \  
     defined(PEGASUS_OS_VXWORKS)  
         //         //
         // Check if a CIM Server is already running.  If so, print an error         // Check if a CIM Server is already running.  If so, print an error
         // message and notify the parent process (if there is one) to terminate         // message and notify the parent process (if there is one) to terminate
Line 1251 
Line 1221 
     deleteCIMServer();     deleteCIMServer();
     return 0;     return 0;
 } }
   
 #if !defined(PEGASUS_BUILDING_CIMSERVER_LIBRARY)  
   
 int main(int argc, char** argv)  
 {  
     return PegasusServerMain(argc, argv);  
 }  
   
 #endif /* PEGASUS_BUILDING_CIMSERVER_LIBRARY */  

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