From 7ae500f28d46e81ff16e62c1e02661a346218f6c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 20 Sep 2022 16:30:56 +0200
Subject: [PATCH] Improved page rendering speed logging

---
 src/App.php      |  2 +-
 src/App/Page.php | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/App.php b/src/App.php
index ceace228f5..a141adf491 100644
--- a/src/App.php
+++ b/src/App.php
@@ -586,7 +586,7 @@ class App
 		$this->profiler->set(microtime(true), 'classinit');
 
 		$moduleName = $this->args->getModuleName();
-		$page->setLogging($this->args->getCommand(), $this->args->getMethod());
+		$page->setLogging($this->args->getMethod(), $this->args->getModuleName(), $this->args->getCommand());
 
 		try {
 			// Missing DB connection: ERROR
diff --git a/src/App/Page.php b/src/App/Page.php
index 475681054a..6331456119 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -80,8 +80,9 @@ class Page implements ArrayAccess
 	private $basePath;
 
 	private $timestamp = 0;
-	private $command   = '';
 	private $method    = '';
+	private $module    = '';
+	private $command   = '';
 
 	/**
 	 * @param string $basepath The Page basepath
@@ -92,21 +93,25 @@ class Page implements ArrayAccess
 		$this->basePath = $basepath;
 	}
 
-	public function setLogging(string $command, string $method)
+	public function setLogging(string $method, string $module, string $command)
 	{
-		$this->command = $command;
 		$this->method  = $method;
+		$this->module  = $module;
+		$this->command = $command;
 	}
 
 	public function logRuntime(IManageConfigValues $config, string $origin = '')
 	{
-		if (in_array($this->command, $config->get('system', 'runtime_ignore'))) {
+		$ignore = $config->get('system', 'runtime_ignore');
+		if (in_array($this->module, $ignore) || in_array($this->command, $ignore)) {
 			return;
 		}
 
-		$runtime = number_format(microtime(true) - $this->timestamp, 3);
+		$signature = !empty($_SERVER['HTTP_SIGNATURE']);
+		$load      = number_format(System::currentLoad(), 2);
+		$runtime   = number_format(microtime(true) - $this->timestamp, 3);
 		if ($runtime > $config->get('system', 'runtime_loglimit')) {
-			Logger::debug('Runtime', ['method' => $this->method, 'command' => $this->command, 'runtime' => $runtime, 'origin' => $origin]);
+			Logger::debug('Runtime', ['method' => $this->method, 'module' => $this->module, 'runtime' => $runtime, 'load' => $load, 'origin' => $origin, 'signature' => $signature, 'request' => $_SERVER['REQUEST_URI'] ?? '']);
 		}
 	}