(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 and 1.211.2.14

version 1.211, 2007/09/10 08:17:07 version 1.211.2.14, 2007/11/03 22:42:34
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/ServerShutdownClient.h>  
 #include <Service/ServerRunStatus.h> #include <Service/ServerRunStatus.h>
  
   #if !defined(PEGASUS_REMOVE_SERVER_CLIENT_USAGE)
   # include <Pegasus/Client/CIMClient.h>
   # include <Service/ServerShutdownClient.h>
   #endif
   
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
 #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h> #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h>
 #include <Service/ARM_zOS.h> #include <Service/ARM_zOS.h>
Line 105 
Line 108 
 # endif # endif
 #endif #endif
  
 #if defined(PEGASUS_OS_TYPE_UNIX)  #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VXWORKS)
 # include <unistd.h> # include <unistd.h>
 # include <sys/types.h> # include <sys/types.h>
 # include <sys/stat.h> # include <sys/stat.h>
Line 141 
Line 144 
 #include <as400_protos.h> //for _SETCCSID #include <as400_protos.h> //for _SETCCSID
 #endif #endif
  
 class CIMServerProcess : public ServerProcess  class PEGASUS_SERVER_LINKAGE CIMServerProcess : public ServerProcess
 { {
 public: public:
  
Line 245 
Line 248 
     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 262 
Line 273 
  
     // 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 429 
Line 442 
 //  MAIN //  MAIN
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
  
 int main(int argc, char** argv)  extern "C" int PegasusServerMain(int argc, char** argv)
 { {
     String pegasusHome;     String pegasusHome;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
Line 692 
Line 705 
     // 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 763 
Line 779 
         //         //
         // 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 785 
Line 802 
 #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 808 
Line 829 
             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 878 
Line 900 
             e.getMessage());             e.getMessage());
     }     }
  
 #ifndef PEGASUS_OS_TYPE_WINDOWS  #if !defined(PEGASUS_OS_TYPE_WINDOWS) && !defined(PEGASUS_OS_VXWORKS)
     umask(S_IRWXG|S_IRWXO);     umask(S_IRWXG|S_IRWXO);
 #endif #endif
  
Line 887 
Line 909 
     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 905 
Line 929 
         AutoFileLock fileLock(startupLockFileName);         AutoFileLock fileLock(startupLockFileName);
 #endif #endif
  
 #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)  #if defined(PEGASUS_OS_TYPE_UNIX) || \
       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 1119 
Line 1145 
 #endif #endif
         }         }
  
   #if defined(PEGASUS_OS_VXWORKS)
           cout << "Started CIM Server." << endl;
   #endif
   
 #if defined(PEGASUS_DEBUG) #if defined(PEGASUS_DEBUG)
         cout << "Started. " << endl;         cout << "Started. " << endl;
 #endif #endif
Line 1225 
Line 1255 
     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  
changed lines
  Added in v.1.211.2.14
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2