diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-03-22 12:08:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 12:08:45 +0100 |
| commit | 0acd4b5f8202be8b3f3b4e6d7481e3d23e496b86 (patch) | |
| tree | 06897c455b69be134fcd61b0f0130609ce7a75a1 /lib/private/DB | |
| parent | b6209d61251f7abacefb8cf3c164d39bcba29100 (diff) | |
| parent | 67452b94ca0b59a063c4364f5930bb5186db2d55 (diff) | |
| download | nextcloud-server-0acd4b5f8202be8b3f3b4e6d7481e3d23e496b86.tar.gz nextcloud-server-0acd4b5f8202be8b3f3b4e6d7481e3d23e496b86.zip | |
Merge pull request #31235 from nextcloud/techdebt/noid/extract-request-id
Extract request id handling to dedicated class so it can be injected without DB dependency
Diffstat (limited to 'lib/private/DB')
| -rw-r--r-- | lib/private/DB/Connection.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index e32c530c19e..6f89ba64e80 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -53,6 +53,7 @@ use OC\DB\QueryBuilder\QueryBuilder; use OC\SystemConfig; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\ILogger; +use OCP\IRequestId; use OCP\PreConditionNotMetException; class Connection extends \Doctrine\DBAL\Connection { @@ -281,11 +282,16 @@ class Connection extends \Doctrine\DBAL\Connection { } protected function logQueryToFile(string $sql): void { - $logFile = $this->systemConfig->getValue('query_log_file', ''); + $logFile = $this->systemConfig->getValue('query_log_file'); if ($logFile !== '' && is_writable(dirname($logFile)) && (!file_exists($logFile) || is_writable($logFile))) { + $prefix = ''; + if ($this->systemConfig->getValue('query_log_file_requestid') === 'yes') { + $prefix .= \OC::$server->get(IRequestId::class)->getId() . "\t"; + } + file_put_contents( $this->systemConfig->getValue('query_log_file', ''), - $sql . "\n", + $prefix . $sql . "\n", FILE_APPEND ); } |