From 107293bd6173af37bcabb946b932169009ce84b9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 20 Feb 2019 17:12:40 +0100
Subject: [PATCH] Fixing rendertime

---
 src/Util/Profiler.php | 89 ++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 2d3da3a9c0..115e75f7ba 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -120,86 +120,95 @@ class Profiler implements ContainerInterface
 	}
 
 	/**
-	 * Save the current profiling data to a log entry
+	 * Returns the rendertime string
 	 *
-	 * @param LoggerInterface $logger The logger to save the current log
-	 * @param string          $message Additional message for the log
+	 * @return string the rendertime
 	 */
-	public function saveLog(LoggerInterface $logger, $message = '')
+	public function getRendertimeString()
 	{
-		// Write down the performance values into the log
-		if (!$this->enabled) {
-			return;
-		}
-		$duration = microtime(true) - $this->get('start');
-		$logger->info(
-			$message,
-			[
-				'action' => 'profiling',
-				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
-				'database_write' => round($this->get('database_write'), 3),
-				'cache_read' => round($this->get('cache'), 3),
-				'cache_write' => round($this->get('cache_write'), 3),
-				'network_io' => round($this->get('network'), 2),
-				'file_io' => round($this->get('file'), 2),
-				'other_io' => round($duration - ($this->get('database')
-						+ $this->get('cache') + $this->get('cache_write')
-						+ $this->get('network') + $this->get('file')), 2),
-				'total' => round($duration, 2)
-			]
-		);
+		$output = '';
 
-		if (!$this->rendertime) {
-			return;
+		if (!$this->enabled || !$this->rendertime) {
+			return $output;
 		}
-		
-		$o = '';
+
 		if (isset($this->callstack["database"])) {
-			$o .= "\nDatabase Read:\n";
+			$output .= "\nDatabase Read:\n";
 			foreach ($this->callstack["database"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["database_write"])) {
-			$o .= "\nDatabase Write:\n";
+			$output .= "\nDatabase Write:\n";
 			foreach ($this->callstack["database_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["cache"])) {
-			$o .= "\nCache Read:\n";
+			$output .= "\nCache Read:\n";
 			foreach ($this->callstack["cache"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["cache_write"])) {
-			$o .= "\nCache Write:\n";
+			$output .= "\nCache Write:\n";
 			foreach ($this->callstack["cache_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["network"])) {
-			$o .= "\nNetwork:\n";
+			$output .= "\nNetwork:\n";
 			foreach ($this->callstack["network"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
-		$logger->info($message . ": " . $o, ['action' => 'profiling']);
+
+		return $output;
+	}
+
+	/**
+	 * Save the current profiling data to a log entry
+	 *
+	 * @param LoggerInterface $logger  The logger to save the current log
+	 * @param string          $message Additional message for the log
+	 */
+	public function saveLog(LoggerInterface $logger, $message = '')
+	{
+		$duration = microtime(true) - $this->get('start');
+		$logger->info(
+			$message,
+			[
+				'action' => 'profiling',
+				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
+				'database_write' => round($this->get('database_write'), 3),
+				'cache_read' => round($this->get('cache'), 3),
+				'cache_write' => round($this->get('cache_write'), 3),
+				'network_io' => round($this->get('network'), 2),
+				'file_io' => round($this->get('file'), 2),
+				'other_io' => round($duration - ($this->get('database')
+						+ $this->get('cache') + $this->get('cache_write')
+						+ $this->get('network') + $this->get('file')), 2),
+				'total' => round($duration, 2)
+			]
+		);
+
+		$output = $this->getRendertimeString();
+		$logger->info($message . ": " . $output, ['action' => 'profiling']);
 	}
 
 	/**
-- 
2.39.5