You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by Christian Hammers <ch...@lathspell.de> on 2009/10/06 22:40:02 UTC
One last change
Hello
Three weeks ago I made the following change, the last one that is left now,
but I cannot exactly remember what I was trying to solve with it! ;-)
Logger::getHierarchy() is marked as @deprecated so replacing it cannot hurt.
Checking for null values neither, I guess.
Any ideas?
bye,
-christian-
--- ../log4php/src/main/php/LoggerLoggingEvent.php 2009-10-06 21:24:42.000000000 +0200
+++ src/main/php/LoggerLoggingEvent.php 2009-10-06 21:23:55.000000000 +0200
@@ -261,9 +261,13 @@
if(is_string($this->message)) {
$this->renderedMessage = $this->message;
} else {
- $hierarchy = Logger::getHierarchy();
- if(method_exists($hierarchy, 'getRendererMap')) {
- $rendererMap = $hierarchy->getRendererMap();
+ if($this->logger !== null) {
+ $repository = $this->logger->getLoggerRepository();
+ } else {
+ $repository = Logger::getLoggerRepository();
+ }
+ if(method_exists($repository, 'getRendererMap')) {
+ $rendererMap = $repository->getRendererMap();
$this->renderedMessage= $rendererMap->findAndRender($this->message);
} else {
$this->renderedMessage =
(string)$this->message;
Re: One last change
Posted by Christian Hammers <ch...@lathspell.de>.
Hi
Luckily you edited LOG4PHP-84 today - this was exactly the bug the
below patch was originally made for. The patch does not work anymore
but the bug is still present! I wrote another patch and created a
unit test. But please review as I "simplified" one of the core classes
that I do not yet fully understand :)
bye,
-christian-
Am Wed, 7 Oct 2009 07:02:39 +0200
schrieb Christian Grobmeier <gr...@gmail.com>:
> > Any ideas?
>
> In ci i don't see a Logger:: getLoggerRepository method at the
> moment... so i think this fix will break :-)
>
> >
> > bye,
> >
> > -christian-
> >
> >
> >
> > --- ../log4php/src/main/php/LoggerLoggingEvent.php 2009-10-06
> > 21:24:42.000000000 +0200 +++ src/main/php/LoggerLoggingEvent.php
> > 2009-10-06 21:23:55.000000000 +0200 @@ -261,9 +261,13 @@
> > if(is_string($this->message)) {
> > $this->renderedMessage =
> > $this->message; } else {
> > - $hierarchy = Logger::getHierarchy();
> > - if(method_exists($hierarchy,
> > 'getRendererMap')) {
> > - $rendererMap =
> > $hierarchy->getRendererMap();
> > + if($this->logger !== null) {
> > + $repository =
> > $this->logger->getLoggerRepository();
> > + } else {
> > + $repository =
> > Logger::getLoggerRepository();
> > + }
> > + if(method_exists($repository,
> > 'getRendererMap')) {
> > + $rendererMap =
> > $repository->getRendererMap(); $this->renderedMessage=
> > $rendererMap->findAndRender($this->message); } else {
> > $this->renderedMessage =
> > (string)$this->message;
> >
Re: One last change
Posted by Christian Hammers <ch...@lathspell.de>.
Hi
I find the Logger::getLoggerRepository() in the SVN history in some
changes from May. I copied the file from a directory with an old
svn version or so...
I revert it.
bye,
-christian-
Am Wed, 7 Oct 2009 07:02:39 +0200
schrieb Christian Grobmeier <gr...@gmail.com>:
> > Any ideas?
>
> In ci i don't see a Logger:: getLoggerRepository method at the
> moment... so i think this fix will break :-)
>
> >
> > bye,
> >
> > -christian-
> >
> >
> >
> > --- ../log4php/src/main/php/LoggerLoggingEvent.php 2009-10-06
> > 21:24:42.000000000 +0200 +++ src/main/php/LoggerLoggingEvent.php
> > 2009-10-06 21:23:55.000000000 +0200 @@ -261,9 +261,13 @@
> > if(is_string($this->message)) {
> > $this->renderedMessage =
> > $this->message; } else {
> > - $hierarchy = Logger::getHierarchy();
> > - if(method_exists($hierarchy,
> > 'getRendererMap')) {
> > - $rendererMap =
> > $hierarchy->getRendererMap();
> > + if($this->logger !== null) {
> > + $repository =
> > $this->logger->getLoggerRepository();
> > + } else {
> > + $repository =
> > Logger::getLoggerRepository();
> > + }
> > + if(method_exists($repository,
> > 'getRendererMap')) {
> > + $rendererMap =
> > $repository->getRendererMap(); $this->renderedMessage=
> > $rendererMap->findAndRender($this->message); } else {
> > $this->renderedMessage =
> > (string)$this->message;
> >
Re: One last change
Posted by Christian Grobmeier <gr...@gmail.com>.
> Any ideas?
In ci i don't see a Logger:: getLoggerRepository method at the
moment... so i think this fix will break :-)
>
> bye,
>
> -christian-
>
>
>
> --- ../log4php/src/main/php/LoggerLoggingEvent.php 2009-10-06 21:24:42.000000000 +0200
> +++ src/main/php/LoggerLoggingEvent.php 2009-10-06 21:23:55.000000000 +0200
> @@ -261,9 +261,13 @@
> if(is_string($this->message)) {
> $this->renderedMessage = $this->message;
> } else {
> - $hierarchy = Logger::getHierarchy();
> - if(method_exists($hierarchy, 'getRendererMap')) {
> - $rendererMap = $hierarchy->getRendererMap();
> + if($this->logger !== null) {
> + $repository = $this->logger->getLoggerRepository();
> + } else {
> + $repository = Logger::getLoggerRepository();
> + }
> + if(method_exists($repository, 'getRendererMap')) {
> + $rendererMap = $repository->getRendererMap();
> $this->renderedMessage= $rendererMap->findAndRender($this->message);
> } else {
> $this->renderedMessage =
> (string)$this->message;
>