LoggerLoggingEvent: Replaced getTime() with getRelativeTime().
The new method, apart from having a better descriptive name, does not perform unnecessary number formatting, and multiplication by 1000 which getTime() does so it's faster. Marked getTime() as deprecated.
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1379731 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/php/LoggerLoggingEvent.php b/src/main/php/LoggerLoggingEvent.php
index f976863..db3f56c 100644
--- a/src/main/php/LoggerLoggingEvent.php
+++ b/src/main/php/LoggerLoggingEvent.php
@@ -305,8 +305,23 @@
}
/**
- * Calculates the time of this event.
- * @return the time after event starttime when this event has occured
+ * Returns the time in seconds passed from the beginning of execution to
+ * the time the event was constructed.
+ *
+ * @return float Seconds with microseconds in decimals.
+ */
+ public function getRelativeTime() {
+ return $this->timeStamp - self::$startTime;
+ }
+
+ /**
+ * Returns the time in milliseconds passed from the beginning of execution
+ * to the time the event was constructed.
+ *
+ * @deprecated This method has been replaced by getRelativeTime which
+ * does not perform unneccesary multiplication and formatting.
+ *
+ * @return integer
*/
public function getTime() {
$eventTime = $this->getTimeStamp();
diff --git a/src/main/php/layouts/LoggerLayoutHtml.php b/src/main/php/layouts/LoggerLayoutHtml.php
index bee0717..ea2769b 100644
--- a/src/main/php/layouts/LoggerLayoutHtml.php
+++ b/src/main/php/layouts/LoggerLayoutHtml.php
@@ -122,7 +122,7 @@
$sbuf = PHP_EOL . "<tr>" . PHP_EOL;
$sbuf .= "<td>";
- $sbuf .= $event->getTime();
+ $sbuf .= round(1000 * $event->getRelativeTime());
$sbuf .= "</td>" . PHP_EOL;
$sbuf .= "<td title=\"" . $event->getThreadName() . " thread\">";
diff --git a/src/main/php/pattern/LoggerPatternConverterRelative.php b/src/main/php/pattern/LoggerPatternConverterRelative.php
index 116ea09..175e694 100644
--- a/src/main/php/pattern/LoggerPatternConverterRelative.php
+++ b/src/main/php/pattern/LoggerPatternConverterRelative.php
@@ -30,7 +30,7 @@
class LoggerPatternConverterRelative extends LoggerPatternConverter {
public function convert(LoggerLoggingEvent $event) {
- $ts = $event->getTimeStamp() - $event->getStartTime();
+ $ts = $event->getRelativeTime();
return number_format($ts, 4);
}
}
diff --git a/src/test/php/layouts/LoggerLayoutHtmlTest.php b/src/test/php/layouts/LoggerLayoutHtmlTest.php
index 7b842d1..59d7e5c 100644
--- a/src/test/php/layouts/LoggerLayoutHtmlTest.php
+++ b/src/test/php/layouts/LoggerLayoutHtmlTest.php
@@ -35,7 +35,7 @@
$v = $layout->format($event);
$e = PHP_EOL."<tr>".PHP_EOL.
- "<td>".$event->getTime()."</td>".PHP_EOL.
+ "<td>".round(1000*$event->getRelativeTime())."</td>".PHP_EOL.
"<td title=\"".$event->getThreadName()." thread\">".$event->getThreadName()."</td>".PHP_EOL.
"<td title=\"Level\">ERROR</td>".PHP_EOL.
"<td title=\"TEST category\">TEST</td>".PHP_EOL.
@@ -52,7 +52,7 @@
$v = $layout->format($event);
$e = PHP_EOL."<tr>".PHP_EOL.
- "<td>".$event->getTime()."</td>".PHP_EOL.
+ "<td>".round(1000*$event->getRelativeTime())."</td>".PHP_EOL.
"<td title=\"".$event->getThreadName()." thread\">".$event->getThreadName()."</td>".PHP_EOL.
"<td title=\"Level\"><font color=\"#993300\"><strong>WARN</strong></font></td>".PHP_EOL.
"<td title=\"TEST category\">TEST</td>".PHP_EOL.
