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

version 1.211, 2007/09/10 08:17:07 version 1.211.2.2, 2007/09/13 00:31:48
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 763 
Line 763 
         //         //
         // Check to see if we should start Pegasus as a daemon         // Check to see if we should start Pegasus as a daemon
         //         //
   
   // ATTN-MEB: put this back!
   #if defined(PEGASUS_OS_VXWORKS)
           daemonOption = false;
   #else
         daemonOption = ConfigManager::parseBooleanValue(         daemonOption = ConfigManager::parseBooleanValue(
             configManager->getCurrentValue("daemon"));             configManager->getCurrentValue("daemon"));
   #endif
  
 #if !defined(PEGASUS_USE_SYSLOGS) #if !defined(PEGASUS_USE_SYSLOGS)
         String logsDirectory = ConfigManager::getHomedPath(         String logsDirectory = ConfigManager::getHomedPath(
Line 878 
Line 884 
             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 892 
  
     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 911 
         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


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2