Author: carnold
Date: Fri Feb 15 19:23:32 2008
New Revision: 628234
URL: http://svn.apache.org/viewvc?rev=628234&view=rev
Log:
LOGCXX-231: Remove LoggerPtr from LoggingEvent
Modified:
logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
logging/log4cxx/trunk/src/test/cpp/helpers/cyclicbuffertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/nt/nteventlogappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp
logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttest.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp Fri Feb 15 19:23:32
2008
@@ -305,7 +305,7 @@
msg.append(LOG4CXX_STR(" messages due to a full event buffer including:
"));
msg.append(maxEvent->getMessage());
return new LoggingEvent(
- Logger::getLoggerLS(maxEvent->getLoggerName()),
+ maxEvent->getLoggerName(),
maxEvent->getLevel(),
msg,
LocationInfo::getLocationUnavailable());
Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Fri Feb 15 19:23:32 2008
@@ -120,7 +120,7 @@
{
Pool p;
LOG4CXX_DECODE_CHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg, location));
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg, location));
callAppenders(event, p);
}
@@ -129,7 +129,7 @@
{
Pool p;
LOG4CXX_DECODE_CHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg,
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
@@ -138,7 +138,7 @@
const LocationInfo& location) const
{
Pool p;
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, message, location));
+ LoggingEventPtr event(new LoggingEvent(name, level1, message,
location));
callAppenders(event, p);
}
@@ -621,7 +621,7 @@
{
Pool p;
LOG4CXX_DECODE_WCHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg, location));
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg, location));
callAppenders(event, p);
}
@@ -629,7 +629,7 @@
{
Pool p;
LOG4CXX_DECODE_WCHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg,
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
@@ -743,7 +743,7 @@
{
Pool p;
LOG4CXX_DECODE_UNICHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg, location));
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg, location));
callAppenders(event, p);
}
@@ -751,7 +751,7 @@
{
Pool p;
LOG4CXX_DECODE_UNICHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg,
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
@@ -862,7 +862,7 @@
{
Pool p;
LOG4CXX_DECODE_CFSTRING(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg, location));
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg, location));
callAppenders(event, p);
}
@@ -870,7 +870,7 @@
{
Pool p;
LOG4CXX_DECODE_CFSTRING(msg, message);
- LoggingEventPtr event(new LoggingEvent(const_cast<Logger*>(this),
level1, msg,
+ LoggingEventPtr event(new LoggingEvent(name, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
Modified: logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp Fri Feb 15 19:23:32 2008
@@ -63,7 +63,7 @@
}
LoggingEvent::LoggingEvent(
- const LoggerPtr& logger1, const LevelPtr& level1,
+ const LogString& logger1, const LevelPtr& level1,
const LogString& message1, const LocationInfo& locationInfo1) :
logger(logger1),
level(level1),
@@ -85,11 +85,6 @@
delete properties;
}
-const LogString LoggingEvent::getLoggerName() const
-{
- return logger->getName();
-}
-
bool LoggingEvent::getNDC(LogString& dest) const
{
if(ndcLookupRequired)
@@ -306,7 +301,7 @@
char lookupsRequired[] = { 0, 0 };
os.writeBytes(lookupsRequired, sizeof(lookupsRequired), p);
os.writeLong(timeStamp/1000, p);
- os.writeObject(logger->getName(), p);
+ os.writeObject(logger, p);
locationInfo.write(os, p);
if (mdcCopy == 0 || mdcCopy->size() == 0) {
os.writeNull(p);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h Fri Feb
15 19:23:32 2008
@@ -36,12 +36,6 @@
namespace log4cxx
{
- class Logger;
- typedef helpers::ObjectPtrT<Logger> LoggerPtr;
-
- class Level;
- typedef helpers::ObjectPtrT<Level> LevelPtr;
-
namespace helpers
{
class ObjectOutputStream;
@@ -83,7 +77,7 @@
@param file The file where this log statement was
written.
@param line The line where this log statement was
written.
*/
- LoggingEvent(const LoggerPtr& logger,
+ LoggingEvent(const LogString& logger,
const LevelPtr& level, const LogString&
message,
const log4cxx::spi::LocationInfo& location);
@@ -94,7 +88,9 @@
{ return level; }
/** Return the name of the #logger. */
- const LogString getLoggerName() const;
+ inline const LogString& getLoggerName() const {
+ return logger;
+ }
/** Return the #message for this logging event. */
inline const LogString& getMessage() const
@@ -193,22 +189,11 @@
*/
void setProperty(const LogString& key, const
LogString& value);
- public:
- /**
- * Fully qualified name of the calling logger class.
- */
- LogString fqnOfLoggerClass;
-
private:
/**
- * The logger of the logging event. This field is not
serialized for
- * performance reasons.
- *
- * <p>
- * It is set by the LoggingEvent constructor or set by
a remote
- * entity after deserialization.
+ * The logger of the logging event.
**/
- LoggerPtr logger;
+ LogString logger;
/** level of logging event. */
LevelPtr level;
Modified: logging/log4cxx/trunk/src/test/cpp/helpers/cyclicbuffertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/cyclicbuffertestcase.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/cyclicbuffertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/cyclicbuffertestcase.cpp Fri Feb
15 19:23:32 2008
@@ -44,12 +44,11 @@
public:
void setUp()
{
- logger = Logger::getLogger(LOG4CXX_TEST_STR("x"));
e.reserve(1000);
LoggingEventPtr event;
for (int i = 0; i < MAX; i++)
{
- event = new LoggingEvent(logger, Level::getDebug(), LOG4CXX_STR("e"),
+ event = new LoggingEvent(LOG4CXX_STR("x"), Level::getDebug(),
LOG4CXX_STR("e"),
log4cxx::spi::LocationInfo::getLocationUnavailable());
e.push_back(event);
}
Modified: logging/log4cxx/trunk/src/test/cpp/nt/nteventlogappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/nt/nteventlogappendertestcase.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/nt/nteventlogappendertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/nt/nteventlogappendertestcase.cpp Fri
Feb 15 19:23:32 2008
@@ -75,10 +75,9 @@
LayoutPtr layout(new PatternLayout(LOG4CXX_STR("%c - %m%n")));
appender->setLayout(layout);
appender->activateOptions(p);
- LoggerPtr logger(Logger::getLogger("org.foobar"));
LoggingEventPtr event(new LoggingEvent(
- logger, Level::getInfo(), LOG4CXX_STR("Hello, World"),
LOG4CXX_LOCATION));
+ LOG4CXX_STR("org.foobar"), Level::getInfo(),
LOG4CXX_STR("Hello, World"), LOG4CXX_LOCATION));
appender->doAppend(event, p);
}
hEventLog = ::OpenEventLogW(NULL, L"log4cxx_test");
Modified: logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp Fri
Feb 15 19:23:32 2008
@@ -73,21 +73,17 @@
LOGUNIT_TEST(testMultiOption);
LOGUNIT_TEST_SUITE_END();
- LoggerPtr logger;
LoggingEventPtr event;
public:
void setUp()
{
- logger = Logger::getLogger(LOG4CXX_TEST_STR("org.foobar"));
-
event = new LoggingEvent(
- logger, Level::getInfo(), LOG4CXX_STR("msg 1"), LOG4CXX_LOCATION);
+ LOG4CXX_STR("org.foobar"), Level::getInfo(), LOG4CXX_STR("msg 1"),
LOG4CXX_LOCATION);
}
void tearDown()
{
- logger->getLoggerRepository()->resetConfiguration();
}
@@ -205,9 +201,7 @@
expected.append(LOG4CXX_STR(" INFO ["));
expected.append(event->getThreadName());
- expected.append(LOG4CXX_STR("] "));
- expected.append(logger->getName());
- expected.append(LOG4CXX_STR(" - msg 1"));
+ expected.append(LOG4CXX_STR("] org.foobar - msg 1"));
expected.append(LOG4CXX_EOL);
assertFormattedEquals(LOG4CXX_STR("%relative %-5level [%thread] %logger
- %m%n"),
Modified: logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp Fri Feb 15
19:23:32 2008
@@ -60,10 +60,9 @@
* @throws Exception if exception during test.
*/
void testSerializationSimple() {
- LoggerPtr root = Logger::getRootLogger();
LoggingEventPtr event =
new LoggingEvent(
- root, Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
+ LOG4CXX_STR("root"), Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
LOGUNIT_ASSERT_EQUAL(true, SerializationTestHelper::compare(
"witness/serialization/simple.bin", event, 237));
@@ -77,10 +76,9 @@
*
*/
void testSerializationWithLocation() {
- LoggerPtr root = Logger::getRootLogger();
LoggingEventPtr event =
new LoggingEvent(
- root, Level::getInfo(), LOG4CXX_STR("Hello, world."),
LOG4CXX_LOCATION);
+ LOG4CXX_STR("root"), Level::getInfo(), LOG4CXX_STR("Hello, world."),
LOG4CXX_LOCATION);
LOGUNIT_ASSERT_EQUAL(true, SerializationTestHelper::compare(
"witness/serialization/location.bin", event, 237));
@@ -92,12 +90,11 @@
*
*/
void testSerializationNDC() {
- LoggerPtr root = Logger::getRootLogger();
NDC::push("ndc test");
LoggingEventPtr event =
new LoggingEvent(
- root, Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
+ LOG4CXX_STR("root"), Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
LOGUNIT_ASSERT_EQUAL(true, SerializationTestHelper::compare(
"witness/serialization/ndc.bin", event, 237));
@@ -109,12 +106,11 @@
*
*/
void testSerializationMDC() {
- LoggerPtr root = Logger::getRootLogger();
MDC::put("mdckey", "mdcvalue");
LoggingEventPtr event =
new LoggingEvent(
- root, Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
+ LOG4CXX_STR("root"), Level::getInfo(), LOG4CXX_STR("Hello, world."),
LocationInfo::getLocationUnavailable());
LOGUNIT_ASSERT_EQUAL(true, SerializationTestHelper::compare(
"witness/serialization/mdc.bin", event, 237));
Modified: logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttest.cpp?rev=628234&r1=628233&r2=628234&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttest.cpp Fri Feb 15
19:23:32 2008
@@ -249,7 +249,7 @@
* @throws Exception if parser can not be constructed or source is not a
valid XML document.
*/
void testFormat() {
- LoggerPtr logger = Logger::getLogger("org.apache.log4j.xml.XMLLayoutTest");
+ LogString logger = LOG4CXX_STR("org.apache.log4j.xml.XMLLayoutTest");
LoggingEventPtr event =
new LoggingEvent(
logger, Level::getInfo(), LOG4CXX_STR("Hello, World"),
LOG4CXX_LOCATION);
@@ -278,7 +278,7 @@
* @throws Exception if parser can not be constructed or source is not a
valid XML document.
*/
void testFormatWithNDC() {
- LoggerPtr logger = Logger::getLogger("org.apache.log4j.xml.XMLLayoutTest");
+ LogString logger = LOG4CXX_STR("org.apache.log4j.xml.XMLLayoutTest");
NDC::push("NDC goes here");
LoggingEventPtr event =
@@ -338,13 +338,12 @@
void testProblemCharacters() {
std::string problemName = "com.example.bar<>&\"'";
LogString problemNameLS = LOG4CXX_STR("com.example.bar<>&\"'");
- LoggerPtr logger = Logger::getLogger(problemName);
LevelPtr level = new XLevel(6000, problemNameLS, 7);
NDC::push(problemName);
MDC::clear();
MDC::put(problemName, problemName);
LoggingEventPtr event =
- new LoggingEvent(logger, level, problemNameLS, LOG4CXX_LOCATION);
+ new LoggingEvent(problemNameLS, level, problemNameLS,
LOG4CXX_LOCATION);
XMLLayout layout;
layout.setProperties(true);
Pool p;
@@ -386,7 +385,7 @@
* Tests CDATA element within NDC content. See bug 37560.
*/
void testNDCWithCDATA() {
- LoggerPtr logger = Logger::getLogger("com.example.bar");
+ LogString logger = LOG4CXX_STR("com.example.bar");
LevelPtr level = Level::getInfo();
std::string ndcMessage ="<envelope><faultstring><![CDATA[The
EffectiveDate]]></faultstring><envelope>";
NDC::push(ndcMessage);
