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

Return to Logger.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/Logger.cpp between version 1.1 and 1.17

version 1.1, 2001/03/23 01:00:46

version 1.17, 2002/06/01 00:25:05

Line 1

//BEGIN_LICENSE

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

// Permission is hereby granted, free of charge, to any person obtaining a

// Permission is hereby granted, free of charge, to any person obtaining a copy

// copy of this software and associated documentation files (the "Software"),

// of this software and associated documentation files (the "Software"), to

// to deal in the Software without restriction, including without limitation

// deal in the Software without restriction, including without limitation the

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// and/or sell copies of the Software, and to permit persons to whom the

// sell copies of the Software, and to permit persons to whom the Software is

// Software is furnished to do so, subject to the following conditions:

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

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

//END_LICENSE

// Author: Mike Brasher (mbrasher@bmc.com)

//BEGIN_HISTORY

// Author:

// Modified By: Sushma Fernandes (Hewlett-Packard Company)

// sushma_fernandes@hp.com

// $Log$

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

// Revision 1.1 2001/03/23 01:00:46 mike

// More logging capabilities.

//END_HISTORY

#include <iostream>

#include <fstream>

#include "System.h"

#include "Logger.h"

#include "System.h"

#include "Destroyer.h"

using namespace std;

#ifdef PEGASUS_OS_HPUX

#include <syslog.h>

#endif

PEGASUS_NAMESPACE_BEGIN

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

const Uint32 Logger::TRACE = (1 << 0);

const Uint32 Logger::INFORMATIVE = (1 << 1);

const Uint32 Logger::INFORMATION = (1 << 1);

const Uint32 Logger::WARNING = (1 << 2);

const Uint32 Logger::SEVERE = (1 << 3);

const Uint32 Logger::FATAL = (1 << 4);

Line 47

Line 51

LoggerRep* Logger::_rep = 0;

String Logger::_homeDirectory = ".";

// FUTURE-SF-P3-20020517 : This may need to be configurable. At least needs

// to be set to 0xFF by default always.

Uint32 Logger::_severityMask = 0xFF; // Set all on by default

Uint32 Logger::_writeControlMask = 0xF; // Set all on by default

/* _allocLogFileName. Allocates the name from a name set.

Today this is static. However, it should be completely

configerable and driven from the config file so that

Log organization and names are open.

ATTN: rewrite this so that names, choice to do logs and

mask for level of severity are all driven from configuration

input.

static char* _allocLogFileName(

const String& homeDirectory,

Logger::LogFileType logFileType)

{

static char* fileNames[] =

static const char* fileNames[] =

{

"trace.log",

"PegasusTrace.log",

"standard.log",

"PegasusStandard.log",

"error.log"

"PegasusError.log",

"PegasusDebug.log"

};

int index = int(logFileType);

Line 66

Line 85

const char* logFileName = fileNames[index];

String result;

result.reserve(homeDirectory.getLength() + 1 + strlen(logFileName));

result.reserve(homeDirectory.size() + 1 + strlen(logFileName));

result += homeDirectory;

result += '/';

result += logFileName;

Line 79

Line 98

LoggerRep(const String& homeDirectory)

{

#ifndef PEGASUS_OS_HPUX

// Add test for home directory set.

// If home directory does not exist, create it.

char* lgDir = homeDirectory.allocateCString();

if (!System::isDirectory(lgDir))

System::makeDirectory(lgDir);

// KS: I put the second test in just in case some trys to create

// a completly erronous directory. At least we will get a message

if (!System::isDirectory(lgDir))

cout << "Logging Disabled";

delete [] lgDir;

char* fileName = _allocLogFileName(homeDirectory, Logger::TRACE_LOG);

_logs[Logger::TRACE_LOG].open(fileName, ios::app);

delete [] fileName;

Line 90

Line 125

fileName = _allocLogFileName(homeDirectory, Logger::ERROR_LOG);

_logs[Logger::ERROR_LOG].open(fileName, ios::app);

delete [] fileName;

fileName = _allocLogFileName(homeDirectory, Logger::DEBUG_LOG);

_logs[Logger::DEBUG_LOG].open(fileName, ios::app);

delete [] fileName;

#endif

}

ostream& logOf(Logger::LogFileType logFileType)

Line 110

Line 151

void Logger::put(

LogFileType logFileType,

const String& systemId,

Uint32 level,

Uint32 severity,

const String& formatString,

const Formatter::Arg& arg0,

const Formatter::Arg& arg1,

Line 123

Line 164

const Formatter::Arg& arg8,

const Formatter::Arg& arg9)

{

// Test for severity against severity mask to determine

// if we write this log.

if ((_severityMask & severity) != 0)

{

if (!_rep)

_rep = new LoggerRep(_homeDirectory);

_rep->logOf(logFileType) << Formatter::format(formatString,

// Get the Severity String

arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) << endl;

// This converts bitmap to string based on highest order

// bit set

// ATTN: KS Fix this more efficiently.

static const char* svNames[] =

{

"TRACE ",

"INFO ",

"WARNING ",

"SEVERE ",

"FATAL "

};

// NUM_LEVELS = 5

int sizeSvNames = sizeof(svNames) / sizeof(svNames[0]) - 1;

String logMsg = Formatter::format(formatString,

arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

ArrayDestroyer<char> logMsgCString(logMsg.allocateCString());

#ifdef PEGASUS_OS_HPUX

// FUTURE-SF-P3-20020517 : Use the Syslog on HP-UX. Eventually only

// certain messages will go to the Syslog and others to the

// Pegasus Logger.

Uint32 syslogLevel = LOG_DEBUG;

// Map the log levels.

if (severity & Logger::TRACE) syslogLevel = LOG_DEBUG;

if (severity & Logger::INFORMATION) syslogLevel = LOG_INFO;

if (severity & Logger::WARNING) syslogLevel = LOG_WARNING;

if (severity & Logger::SEVERE) syslogLevel = LOG_ERR;

if (severity & Logger::FATAL) syslogLevel = LOG_CRIT;

// Open the syslog.

// Ignore the systemId and open the log as cimserver

openlog("cimserver", LOG_PID|LOG_CONS, LOG_DAEMON);

// Log the message

syslog(syslogLevel, "%s", logMsgCString.getPointer());

// Close the syslog.

closelog();

#else

const char* tmp = "";

if (severity & Logger::TRACE) tmp = "TRACE ";

if (severity & Logger::INFORMATION) tmp = "INFO ";

if (severity & Logger::WARNING) tmp = "WARNING ";

if (severity & Logger::SEVERE) tmp = "SEVERE ";

if (severity & Logger::FATAL) tmp = "FATAL ";

_rep->logOf(logFileType) << System::getCurrentASCIITime()

<< " " << tmp << logMsgCString.getPointer() << endl;

#endif

}

void Logger::clean(const String& directory)

{

//String logFiles = logsDirectory;

//logFiles.append("/PegasusTrace.log");

//char* lgFiles = logFiles.allocateCString();

//cout << "Delete logs in " << logFiles << endl;

//System::removeFile(lgFiles);

//delete [] lgFiles;

//for (i = xx; i < yy; i++)

//(

//_allocateLogFileName(directory, i)

//removeFile(

//}

}

void Logger::setHomeDirectory(const String& homeDirectory)

Legend:

Removed from v.1.1
changed lines
	Added in v.1.17

No CVS admin address has been configured