Merge pull request #30038 from nextcloud/backport/30028/stable22

[stable22] Fix log_query config flag
nextcloud · Dec 2, 2021 · ea6c0f3 · ea6c0f3
2 parents 68b16b7 + 64834a0
commit ea6c0f3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -684,7 +684,16 @@ public function __construct($webRoot, \OC\Config $config) {
 			$config = $c->get(\OCP\IConfig::class);
 
 			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
+				if (!$config->getSystemValueBool('log_query')) {
+					$v = \OC_App::getAppVersions();
+				} else {
+					// If the log_query is enabled, we can not get the app versions
+					// as that does a query, which will be logged and the logging
+					// depends on redis and here we are back again in the same function.
+					$v = [
+						'log_query' => 'enabled',
+					];
+				}
 				$v['core'] = implode(',', \OC_Util::getVersion());
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();