(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.8

version 1.211, 2007/09/10 08:17:07 version 1.211.2.8, 2007/09/21 02:59:03
Line 105 
Line 105 
 # 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 245 
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 262 
Line 270 
  
     // 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 438 
Line 448 
     // Set Message loading to process locale     // Set Message loading to process locale
     MessageLoader::_useProcessLocale = true;     MessageLoader::_useProcessLocale = true;
  
   #if defined(PEGASUS_OS_VXWORKS)
   /*
   ATTN-MEB: create constant for this:
   */
       // On VxWorks, run cimserver in /ramfs:0 directory:
       {
           const char PATH[] = "/pegasus:0";
           if (chdir(PATH) != 0)
           {
               fprintf(stderr, "cimserver: failed to chdir to %s\n", PATH);
               fprintf(stderr, "cimserver: aborting...\n");
               exit(1);
           }
           char cwd[4096];
           cwd[0] = '\0';
           getcwd(cwd, sizeof(cwd));
           printf("Changed directory to \"%s\"\n", cwd);
       }
   #endif
   
 #ifdef PEGASUS_OS_ZOS #ifdef PEGASUS_OS_ZOS
     // Direct standard input to /dev/null,     // Direct standard input to /dev/null,
     close(STDIN_FILENO);     close(STDIN_FILENO);
Line 692 
Line 722 
     // 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 796 
         //         //
         // 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 878 
Line 912 
             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 886 
Line 920 
  
     try     try
     {     {
 #if defined(PEGASUS_OS_TYPE_UNIX)  #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_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 939 
         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 1155 
 #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


Legend:
Removed from v.1.211  
changed lines
  Added in v.1.211.2.8

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2