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

Diff for /pegasus/src/Pegasus/Common/Logger.h between version 1.23 and 1.39.8.1

version 1.23, 2005/12/19 21:51:37 version 1.39.8.1, 2013/06/03 22:35:12
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%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
   // copy of this software and associated documentation files (the "Software"),
   // to deal in the Software without restriction, including without limitation
   // the rights to use, copy, modify, merge, publish, distribute, sublicense,
   // and/or sell copies of the Software, and to permit persons to whom the
   // Software is furnished to do so, subject to the following conditions:
   //
   // The above copyright notice and this permission notice shall be included
   // in all copies or substantial portions of the Software.
   //
   // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 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.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  //////////////////////////////////////////////////////////////////////////
 // of this software and associated documentation files (the "Software"), to  
 // deal in the Software without restriction, including without limitation the  
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 // sell copies of the Software, and to permit persons to whom the Software is  
 // furnished to do so, subject to the following conditions:  
 //  
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // 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: Mike Brasher (mbrasher@bmc.com)  
 //  
 // Modified By: Dave Rosckes (rosckes@us.ibm.com)  
 //              David Dillard, Symantec Corp. (david_dillard@symantec.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 43 
Line 38 
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
  
 #define PEG_LOGGER_TRACE(ARGS_LIST) \  
     do \  
     { \  
         if (Logger::wouldLog(Logger::TRACE)) \  
         { \  
             Logger::trace ARGS_LIST ; \  
         } \  
     } \  
     while (0)  
   
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 class LoggerRep; class LoggerRep;
Line 67 
Line 52 
     {     {
         TRACE_LOG,         TRACE_LOG,
         STANDARD_LOG,         STANDARD_LOG,
         ERROR_LOG,          AUDIT_LOG, // Use only if PEGASUS_ENABLE_AUDIT_LOGGER is defined
         DEBUG_LOG          ERROR_LOG
     };     };
  
     enum { NUM_LOGS = 4 };     enum { NUM_LOGS = 4 };
Line 98 
Line 83 
         @param Arg0 - Arg 9 - Up to 9 arguments representing the variables         @param Arg0 - Arg 9 - Up to 9 arguments representing the variables
         that go into the log entry.         that go into the log entry.
         <pre>         <pre>
         Logger::put(Logger::TRACE_LOG, "CIMServer", Logger::WARNING,          Logger::put(Logger::TRACE_LOG, System::CIMSERVER, Logger::WARNING,
             "X=$0, Y=$1, Z=$2", 88,  "Hello World", 7.5);             "X=$0, Y=$1, Z=$2", 88,  "Hello World", 7.5);
         </pre>         </pre>
     */     */
Line 161 
Line 146 
         @param systemId  - ID of the system generating the log entry within         @param systemId  - ID of the system generating the log entry within
         Pegasus. This is user defined but generally breaks down into major         Pegasus. This is user defined but generally breaks down into major
         Pegasus components.         Pegasus components.
         @param level logLevel of the log entry. To be used both t0          @param level logLevel of the log entry. To be used both to
         mark the log entry and tested against a mask to determine if log         mark the log entry and tested against a mask to determine if log
         entry should be written.         entry should be written.
         @param messageId Message ID of the format string to load from          @param msgParms MessageLoaderParms object containing the localizable
         the resource bundle.          message to log.
         @param formatString     Default format definition string. See the  
         Formatter for details.  This will be used as the default format string  
         in case the resource bundle cannot be found.  
         @param Arg0 - Arg 9 - Up to 9 arguments representing the variables  
         that go into the log entry.  
         <pre>  
         Logger::put(Logger::TRACE_LOG, "CIMServer", Logger::WARNING,  
             "X=$0, Y=$1, Z=$2", 88,  "Hello World", 7.5);  
         </pre>  
     */  
     static void put_l(  
         LogFileType logFileType,  
         const String& systemId,  
         Uint32 logLevel,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2,  
         const Formatter::Arg& arg3,  
         const Formatter::Arg& arg4 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg5 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg6 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg7 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);  
   
     /** Optimized zero-argument form of put_l().  
     */     */
     static void put_l(     static void put_l(
         LogFileType logFileType,         LogFileType logFileType,
         const String& systemId,         const String& systemId,
         Uint32 logLevel,         Uint32 logLevel,
         const String& messageId,          const MessageLoaderParms& msgParms);
         const String& formatString);  
   
     /** Optimized one-argument form of put_l().  
     */  
     static void put_l(  
         LogFileType logFileType,  
         const String& systemId,  
         Uint32 logLevel,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0);  
   
     /** Optimized two-argument form of put_l().  
     */  
     static void put_l(  
         LogFileType logFileType,  
         const String& systemId,  
         Uint32 logLevel,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1);  
   
     /** Optimized three-argument form of put_l().  
     */  
     static void put_l(  
         LogFileType logFileType,  
         const String& systemId,  
         Uint32 logLevel,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2);  
   
     /** Puts a message to the define log. Should only be used for trace type  
         logs.  
     */  
     static void trace(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2,  
         const Formatter::Arg& arg3,  
         const Formatter::Arg& arg4 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg5 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg6 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg7 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);  
   
     /** Optimized three-argument form of trace().  
     */  
     static void trace(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& formatString);  
   
     /** Optimized one-argument form of trace().  
     */  
     static void trace(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& formatString,  
         const Formatter::Arg& arg0);  
  
     /** Optimized two-argument form of trace().      /** Puts a trace message into the specified log.
     */     */
     static void trace(     static void trace(
         LogFileType logFileType,         LogFileType logFileType,
         const String& systemId,         const String& systemId,
         const Uint32 logComponent,          const String& message);
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1);  
   
     /** Optimized three-argument form of trace().  
     */  
     static void trace(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2);  
   
     /** Puts a localized message to the log. Should only be used  
         for trace type logs.  
     */  
     static void trace_l(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2,  
         const Formatter::Arg& arg3,  
         const Formatter::Arg& arg4 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg5 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg6 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg7 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);  
   
     /** Optimized zero-argument form of trace_l().  
     */  
     static void trace_l(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& messageId,  
         const String& formatString);  
   
     /** Optimized one-argument form of trace_l().  
     */  
     static void trace_l(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0);  
   
     /** Optimized two-argument form of trace_l().  
     */  
     static void trace_l(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1);  
   
     /** Optimized three-argument form of trace_l().  
     */  
     static void trace_l(  
         LogFileType logFileType,  
         const String& systemId,  
         const Uint32 logComponent,  
         const String& messageId,  
         const String& formatString,  
         const Formatter::Arg& arg0,  
         const Formatter::Arg& arg1,  
         const Formatter::Arg& arg2);  
  
     /** setHomeDirectory     /** setHomeDirectory
     */     */
Line 360 
Line 171 
  
     /** setlogLevelMask     /** setlogLevelMask
     */     */
     static void setlogLevelMask(const String logLevelList);      static void setlogLevelMask(const String &logLevelList);
   
     /** setLogWriteControlMask  
     */  
     static void setLogWriteControlMask(const Uint32);  
  
     /** Returns true if the given string is one of the legal log levels.     /** Returns true if the given string is one of the legal log levels.
     */     */
     static Boolean isValidlogLevel(const String logLevel);      static Boolean isValidlogLevel(const String &logLevel);
  
     /** Tests if a log entry would be created by this call before     /** Tests if a log entry would be created by this call before
         the logger is called.  This function is intended to be used         the logger is called.  This function is intended to be used
Line 391 
Line 198 
         return (_severityMask & logLevel) != 0;         return (_severityMask & logLevel) != 0;
     }     }
  
   #if !defined(PEGASUS_USE_SYSLOGS)
       static void setMaxLogFileSize (Uint32 maxLogFileSizeBytes);
   #endif
   
 private: private:
  
     static LoggerRep* _rep;     static LoggerRep* _rep;
     static String _homeDirectory;     static String _homeDirectory;
     static Uint32 _severityMask;     static Uint32 _severityMask;
     static Uint32 _writeControlMask;  
   
     static const char   _SEPARATOR;  
     static const Uint32 _NUM_LOGLEVEL;     static const Uint32 _NUM_LOGLEVEL;
  
     static const Boolean _SUCCESS;  
     static const Boolean _FAILURE;  
   
     static void _putInternal(     static void _putInternal(
         LogFileType logFileType,         LogFileType logFileType,
         const String& systemId,         const String& systemId,
         const Uint32 logComponent,  
         Uint32 logLevel,         Uint32 logLevel,
         const String& formatString,          const String& message);
         const String& messageId,  
         const Formatter::Arg& arg0 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg1 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg3 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg4 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg5 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg6 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg7 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,  
         const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);  
 }; };
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.23  
changed lines
  Added in v.1.39.8.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2