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.14 and 1.20.10.1

version 1.14, 2003/03/27 17:46:42

version 1.20.10.1, 2005/10/03 18:58:15

Line 1

//%/////////////////////////////////////////////////////////////////////////////

//%2005////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// 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

Line 34

Line 40

#include <Pegasus/Common/Formatter.h>

#include <Pegasus/Common/Linkage.h>

#include <Pegasus/Common/System.h>

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

PEGASUS_NAMESPACE_BEGIN

Line 90

Line 97

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

</pre>

#if 1

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

#endif

static void put(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& formatString);

static void put(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& formatString,

const Formatter::Arg& arg0);

// l10n

#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

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

Pegasus components.

@param level logLevel of the log entry. To be used both t0

mark the log entry and tested against a mask to determine if log

entry should be written.

@param messageId Message ID of the format string to load from

the resource bundle.

@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>

#if 1

static void put_l(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& messageId,

const String& formatString,

const Formatter::Arg& arg0 = Formatter::Arg(),

const Formatter::Arg& arg0,

const Formatter::Arg& arg1 = Formatter::Arg(),

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::Arg(),

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

const Formatter::Arg& arg3 = Formatter::Arg(),

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

const Formatter::Arg& arg4 = Formatter::Arg(),

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

const Formatter::Arg& arg5 = Formatter::Arg(),

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

const Formatter::Arg& arg6 = Formatter::Arg(),

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

const Formatter::Arg& arg7 = Formatter::Arg(),

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

const Formatter::Arg& arg8 = Formatter::Arg(),

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

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

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

#endif

static void put_l(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& messageId,

const String& formatString);

static void put_l(

LogFileType logFileType,

const String& systemId,

Uint32 logLevel,

const String& messageId,

const String& formatString,

const Formatter::Arg& arg0);

#endif

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

// for trace type logs

Line 113

Line 193

const String& systemId,

const Uint32 logComponent,

const String& formatString,

const Formatter::Arg& arg0 = Formatter::Arg(),

const Formatter::Arg& arg0,

const Formatter::Arg& arg1 = Formatter::Arg(),

const Formatter::Arg& arg1,

const Formatter::Arg& arg2 = Formatter::Arg(),

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

const Formatter::Arg& arg3 = Formatter::Arg(),

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

const Formatter::Arg& arg4 = Formatter::Arg(),

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

const Formatter::Arg& arg5 = Formatter::Arg(),

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

const Formatter::Arg& arg6 = Formatter::Arg(),

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

const Formatter::Arg& arg7 = Formatter::Arg(),

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

const Formatter::Arg& arg8 = Formatter::Arg(),

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

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

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

// l10n

#ifdef PEGASUS_USE_EXPERIMENTAL_INTERFACES

// trace - 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& 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);

#endif

/** setHomeDirectory

Line 137

Line 240

static void setLogWriteControlMask(const Uint32);

static Boolean isValidlogLevel(const String logLevel);

static bool wouldLog(Uint32 logLevel)

{

return _severityMask & logLevel;

}

private:

Line 156

Line 265

const Uint32 logComponent,

Uint32 logLevel,

const String& formatString,

const Formatter::Arg& arg0 = Formatter::Arg(),

const String& messageId, // l10n

const Formatter::Arg& arg1 = Formatter::Arg(),

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

const Formatter::Arg& arg2 = Formatter::Arg(),

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

const Formatter::Arg& arg3 = Formatter::Arg(),

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

const Formatter::Arg& arg4 = Formatter::Arg(),

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

const Formatter::Arg& arg5 = Formatter::Arg(),

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

const Formatter::Arg& arg6 = Formatter::Arg(),

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

const Formatter::Arg& arg7 = Formatter::Arg(),

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

const Formatter::Arg& arg8 = Formatter::Arg(),

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

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

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

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

};

Legend:

Removed from v.1.14
changed lines
	Added in v.1.20.10.1

No CVS admin address has been configured