(file) Return to TraceFileHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/TraceFileHandler.cpp between version 1.35 and 1.36

version 1.35, 2008/08/14 17:30:39 version 1.36, 2008/09/18 08:01:37
Line 32 
Line 32 
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
   #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/TraceFileHandler.h> #include <Pegasus/Common/TraceFileHandler.h>
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
Line 56 
Line 57 
     _fileName = 0;     _fileName = 0;
     _fileHandle = 0;     _fileHandle = 0;
     _wroteToLog = false;     _wroteToLog = false;
       _configHasChanged = true;
 #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     _baseFileName = 0;     _baseFileName = 0;
     _fileCount = 0;     _fileCount = 0;
Line 73 
Line 75 
     {     {
         fclose(_fileHandle);         fclose(_fileHandle);
     }     }
     delete [] _fileName;      free(_fileName);
 #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     delete [] _baseFileName;      free(_baseFileName);
 #endif #endif
 } }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 //  Sets the filename to the given filename and opens the file in append  // The configuration of the trace has been updated.
 //  mode  // At the next trace write, change to the new configuration.
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
   void TraceFileHandler::configurationUpdated()
   {
       _configHasChanged = true;
   }
  
 Uint32 TraceFileHandler::setMessageDestination(const char* fileName)  ////////////////////////////////////////////////////////////////////////////////
   // If the trace configuration has been updated,
   // close the old file and open the new file.
   ////////////////////////////////////////////////////////////////////////////////
   void TraceFileHandler::_reConfigure()
 { {
     // If a file is already open, close it      AutoMutex writeLock(writeMutex);
     if (_fileHandle)  
       if(!_configHasChanged)
     {     {
         fclose(_fileHandle);          // An other thread does already the re-configuration.
         _fileHandle = 0;          // do nothing.
           return;
     }     }
  
     delete [] _fileName;      free(_fileName);
     _fileName = 0;     _fileName = 0;
 #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     delete [] _baseFileName;      free(_baseFileName);
     _baseFileName = 0;     _baseFileName = 0;
 #endif #endif
  
     if (!isValidMessageDestination(fileName))      if (!(const char*)Tracer::_getInstance() ->_traceFile.getCString())
       {
           // if the file name is empty/NULL pointer do nothing
           return;
       }
   
       _fileName = strdup((const char*)Tracer::_getInstance()
                               ->_traceFile.getCString());
   
       // If a file is already open, close it.
       if (_fileHandle)
     {     {
         return 1;          fclose(_fileHandle);
           _fileHandle = 0;
     }     }
     _fileHandle = _openFile(fileName);  
       _fileHandle = _openFile(_fileName);
     if (!_fileHandle)     if (!_fileHandle)
     {     {
         return 1;          // return with no message. _openFile() already wrote one.
           free(_fileName);
           _fileName = 0;
           return;
     }     }
  
     _fileName = new char[strlen(fileName)+1];  
     strcpy(_fileName, fileName);  
 #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     _baseFileName = new char[strlen(fileName)+1];      _baseFileName = strdup(_fileName);
     strcpy(_baseFileName, fileName);  
 #endif #endif
  
     return 0;      _configHasChanged=false;
   
       return;
 } }
  
 FILE* TraceFileHandler::_openFile(const char* fileName) FILE* TraceFileHandler::_openFile(const char* fileName)
Line 131 
Line 157 
     if (!fileHandle)     if (!fileHandle)
     {     {
         // Unable to open file, log a message         // Unable to open file, log a message
         Logger::put_l(          Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,
             Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,  
             MessageLoaderParms(             MessageLoaderParms(
                 "Common.TraceFileHandler.FAILED_TO_OPEN_FILE",                  "Common.TraceFileHandler.FAILED_TO_OPEN_FILE_SYSMSG",
                 "Failed to open file $0",                  "Failed to open file $0: $1",
                 fileName));                  fileName,PEGASUS_SYSTEM_ERRORMSG_NLS));
         return 0;         return 0;
     }     }
  
Line 180 
Line 205 
     return fileHandle;     return fileHandle;
 } }
  
 Boolean TraceFileHandler::isValidMessageDestination(const char* filePath)  
 {  
     String fileName = String(filePath);  
   
     // Check if the file path is a directory  
     FileSystem::translateSlashes(fileName);  
     if (FileSystem::isDirectory(fileName))  
     {  
         return false;  
     }  
   
     // Check if the file exists and is writable  
     if (FileSystem::exists(fileName))  
     {  
         return FileSystem::canWrite(fileName);  
     }  
   
     // Check if directory is writable  
     Uint32 index = fileName.reverseFind('/');  
   
     if (index != PEG_NOT_FOUND)  
     {  
         String dirName = fileName.subString(0,index);  
   
         if (dirName.size() == 0)  
         {  
             dirName = "/";  
         }  
   
         if (!FileSystem::isDirectory(dirName))  
         {  
             return false;  
         }  
   
         return FileSystem::canWrite(dirName);  
     }  
   
     String currentDir;  
   
     // Check if there is permission to write in the  
     // current working directory  
     FileSystem::getCurrentDirectory(currentDir);  
   
     return FileSystem::canWrite(currentDir);  
 }  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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