(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.28 and 1.38

version 1.28, 2006/04/18 19:08:42 version 1.38, 2008/12/01 17:49:57
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  //
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  // Permission is hereby granted, free of charge, to any person obtaining a
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  //
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  //////////////////////////////////////////////////////////////////////////
 //  
 //==============================================================================  
 //  
 // Author: Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com)  
 //  
 // Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01  
 //              added nsk platform support  
 //              Amit K Arora, IBM (amita@in.ibm.com) for Bug#1527  
 //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //              Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 //#include <fstream>  
 //#include <iostream>  
 #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)
 # include <Pegasus/Common/TraceFileHandlerWindows.cpp> # include <Pegasus/Common/TraceFileHandlerWindows.cpp>
 #elif defined(PEGASUS_OS_TYPE_UNIX)  #elif defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)
 # include <Pegasus/Common/TraceFileHandlerUnix.cpp>  # include <Pegasus/Common/TraceFileHandlerPOSIX.cpp>
 #elif defined(PEGASUS_OS_TYPE_NSK)  
 # include <Pegasus/Common/TraceFileHandlerNsk.cpp>  
 #elif defined(PEGASUS_OS_VMS)  
 # include <Pegasus/Common/TraceFileHandlerVms.cpp>  
 #else #else
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
Line 70 
Line 55 
     _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 87 
Line 73 
     {     {
         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::setFileName(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 (!isValidFilePath(fileName))      if (Tracer::_getInstance() ->_traceFile.size() == 0)
     {     {
         return 1;          // if the file name is empty/NULL pointer do nothing
           // wait for a new trace file.
           _configHasChanged=false;
           return;
     }     }
     _fileHandle = _openFile(fileName);  
       _fileName = strdup((const char*)Tracer::_getInstance()
                               ->_traceFile.getCString());
   
       // If a file is already open, close it.
       if (_fileHandle)
       {
           fclose(_fileHandle);
           _fileHandle = 0;
       }
   
       _fileHandle = _openFile(_fileName);
     if (!_fileHandle)     if (!_fileHandle)
     {     {
         return 1;          // return with no message. _openFile() already wrote one.
           free(_fileName);
           _fileName = 0;
           // wait for a new trace file
           _configHasChanged=false;
           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 145 
Line 159 
     if (!fileHandle)     if (!fileHandle)
     {     {
         // Unable to open file, log a message         // Unable to open file, log a message
         Logger::put_l(Logger::DEBUG_LOG, System::CIMSERVER, Logger::WARNING,          Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,
             "Common.TraceFileHandler.FAILED_TO_OPEN_FILE",              MessageLoaderParms(
             "Failed to open file $0", fileName);                  "Common.TraceFileHandler.FAILED_TO_OPEN_FILE_SYSMSG",
                   "Failed to open file $0: $1",
                   fileName,PEGASUS_SYSTEM_ERRORMSG_NLS));
         return 0;         return 0;
     }     }
  
Line 157 
Line 173 
     if (!System::verifyFileOwnership(fileName))     if (!System::verifyFileOwnership(fileName))
     {     {
         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,
               MessageLoaderParms(
            "Common.TraceFileHandler.UNEXPECTED_FILE_OWNER",            "Common.TraceFileHandler.UNEXPECTED_FILE_OWNER",
            "File $0 is not owned by user $1.", fileName,            "File $0 is not owned by user $1.", fileName,
            System::getEffectiveUserName());                  System::getEffectiveUserName()));
         fclose(fileHandle);         fclose(fileHandle);
         return 0;         return 0;
     }     }
Line 175 
Line 192 
             String(fileName), (_S_IREAD|_S_IWRITE)) )             String(fileName), (_S_IREAD|_S_IWRITE)) )
 #endif #endif
     {     {
         Logger::put_l(Logger::DEBUG_LOG, System::CIMSERVER, Logger::WARNING,          Logger::put_l(
               Logger::ERROR_LOG,
               System::CIMSERVER,
               Logger::WARNING,
               MessageLoaderParms(
            "Common.TraceFileHandler.FAILED_TO_SET_FILE_PERMISSIONS",            "Common.TraceFileHandler.FAILED_TO_SET_FILE_PERMISSIONS",
            "Failed to set permissions on file $0", fileName);                  "Failed to set permissions on file $0",
                   fileName));
         fclose(fileHandle);         fclose(fileHandle);
         return 0;         return 0;
     }     }
Line 185 
Line 207 
     return fileHandle;     return fileHandle;
 } }
  
 Boolean TraceFileHandler::isValidFilePath(const char* filePath)  
 {  
     String fileName = String(filePath);  
   
     // Check if the file path is a directory  
     FileSystem::translateSlashes(fileName);  
     if (FileSystem::isDirectory(fileName))  
     {  
         return 0;  
     }  
   
     // Check if the file exists and is writable  
     if (FileSystem::exists(fileName))  
     {  
         if (!FileSystem::canWrite(fileName))  
         {  
             return 0;  
         }  
         else  
         {  
             return 1;  
         }  
     }  
     else  
     {  
         // Check if directory is writable  
         Uint32 index = fileName.reverseFind('/');  
   
         if (index != PEG_NOT_FOUND)  
         {  
             String dirName = fileName.subString(0,index);  
             if (!FileSystem::isDirectory(dirName))  
             {  
                 return 0;  
             }  
             if (!FileSystem::canWrite(dirName) )  
             {  
                 return 0;  
             }  
             else  
             {  
                 return 1;  
             }  
         }  
         else  
         {  
             String currentDir;  
   
             // Check if there is permission to write in the  
             // current working directory  
             FileSystem::getCurrentDirectory(currentDir);  
   
             if (!FileSystem::canWrite(currentDir))  
             {  
                 return 0;  
             }  
             else  
             {  
                 return 1;  
             }  
         }  
     }  
     PEGASUS_UNREACHABLE(return 1;)  
 }  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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