pegasus/src/Pegasus/Common/Logger.h - diff

Return to Logger.h CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Logger.h between version 1.20 and 1.21

version 1.20, 2005/02/05 22:59:23

version 1.21, 2005/10/31 16:53:08

Line 40

#include <Pegasus/Common/Formatter.h>

#include <Pegasus/Common/Linkage.h>

#include <Pegasus/Common/System.h>

#include <Pegasus/Common/MessageLoader.h> // l10n

#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

class LoggerRep;

// REVIEW: is this still used? Are there other mechanisms?

/** This class provides the interface for writing log records to the log.

/**

class PEGASUS_COMMON_LINKAGE Logger

{

public:

Line 63

Line 69

ERROR_LOG,

DEBUG_LOG

};

enum { NUM_LOGS = 4 };

/** Log file Level - Defines the loglevel of the

/** Log file Level - Defines the loglevel of the log entry irrespective of

log entry irrespective of which log file it goes into. This is

which log file it goes into. This is actually a bit mask as defined in

actually a bit mask as defined in logger.cpp. Thus, it serves both

logger.cpp. Thus, it serves both as a level of indication of the

as a level of indication of the seriousness and possibly as a mask

seriousness and possibly as a mask to select what is logged.

to select what is logged.

ATTN: The selection test has not been done.

static const Uint32 TRACE;

static const Uint32 INFORMATION;

static const Uint32 WARNING;

static const Uint32 SEVERE;

static const Uint32 FATAL;

/** Puts a message to the defined log file

/** put - Puts a message to the defined log file

@param logFileType - Type of log file (Trace, etc.)

@param systemId - ID of the system generating the log entry within

Pegasus. This is user defined but generally breaks down into major

Line 97

Line 101

"X=$0, Y=$1, Z=$2", 88, "Hello World", 7.5);

</pre>

#if 1

static void put(

LogFileType logFileType,

const String& systemId,

Line 105

Line 108

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg2,

const Formatter::Arg& arg3 = Formatter::DEFAULT_ARG,

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);

#endif

/** Optimized zero-argument form of put().

static void put(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& formatString);

/** Optimized one-argument form of put().

static void put(

LogFileType logFileType,

const String& systemId,

Line 128

Line 134

const String& formatString,

const Formatter::Arg& arg0);

// l10n

/** Optimized two-argument form of put().

static void put(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1);

/** Optimized three-argument form of put().

static void put(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1,

const Formatter::Arg& arg2);

#ifdef PEGASUS_USE_EXPERIMENTAL_INTERFACES

/** put_l - Puts a localized message to the defined log file

@param logFileType - Type of log file (Trace, etc.)

@param systemId - ID of the system generating the log entry within

Line 150

Line 177

"X=$0, Y=$1, Z=$2", 88, "Hello World", 7.5);

</pre>

#if 1

static void put_l(

LogFileType logFileType,

const String& systemId,

Line 159

Line 185

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg2,

const Formatter::Arg& arg3 = Formatter::DEFAULT_ARG,

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);

#endif

/** Optimized zero-argument form of put_l().

static void put_l(

LogFileType logFileType,

const String& systemId,

Line 176

Line 203

const String& messageId,

const String& formatString);

/** Optimized one-argument form of put_l().

static void put_l(

LogFileType logFileType,

const String& systemId,

Line 183

Line 212

const String& messageId,

const String& formatString,

const Formatter::Arg& arg0);

#endif

/** 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);

#endif /* PEGASUS_USE_EXPERIMENTAL_INTERFACES */

// _trace - puts a message to the define log. Should only be used

/** Puts a message to the define log. Should only be used for trace type

// for trace type logs

logs.

static void trace(

LogFileType logFileType,

const String& systemId,

Line 195

Line 248

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg2,

const Formatter::Arg& arg3 = Formatter::DEFAULT_ARG,

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,

Line 204

Line 257

const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);

// l10n

/** 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().

static void trace(

LogFileType logFileType,

const String& systemId,

const Uint32 logComponent,

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);

#ifdef PEGASUS_USE_EXPERIMENTAL_INTERFACES

// trace - puts a localized message to the log. Should only be used

// for trace type logs

/** 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 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg2,

const Formatter::Arg& arg3 = Formatter::DEFAULT_ARG,

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);

#endif

/** 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);

#endif /* PEGASUS_USE_EXPERIMENTAL_INTERFACES */

/** setHomeDirectory

Line 239

Line 373

static void setLogWriteControlMask(const Uint32);

/** Returns true if the given string is one of the legal log levels.

static Boolean isValidlogLevel(const String logLevel);

private:

/** Tests if a log entry would be created by this call before

the logger is called. This function is intended to be used

within the server for high usage log entries to avoid the

overhead of doing the call when no log is created.

@param logLevel Uint32 defining the level of the log to be

executed.

<p><b>Example:</b>

<pre>

if (Logger::wouldLog(Logger::TRACE))

{

Logger::put(Logger::STANDARD_LOG, System::CIMSERVER,

Logger::TRACE, "HTTPMessage - HTTP header name: $0 "

"HTTP header value: $1" ,name,value);

}

</pre>

static bool wouldLog(Uint32 logLevel)

{

return _severityMask & logLevel;

}

private:

static LoggerRep* _rep;

static String _homeDirectory;

Line 253

Line 410

static const Boolean _SUCCESS;

static const Boolean _FAILURE;

static void _putInternal(

LogFileType logFileType,

const String& systemId,

const Uint32 logComponent,

Uint32 logLevel,

const String& formatString,

const String& messageId, // l10n

const String& messageId,

const Formatter::Arg& arg0 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg1 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg2 = Formatter::DEFAULT_ARG,

Line 270

Line 428

const Formatter::Arg& arg7 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg8 = Formatter::DEFAULT_ARG,

const Formatter::Arg& arg9 = Formatter::DEFAULT_ARG);

};

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.20
changed lines
	Added in v.1.21

No CVS admin address has been configured