nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #44810 from nextcloud/moveToOCPServer 

chore(db): move to OCP\Server
This commit is contained in:
Joas Schilling 2024-04-15 14:00:44 +02:00 committed by GitHub
parent d8d05ecca6 5f519a2e7d
commit 10fc78a9ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/DB/Connection.php
View File

@ -55,6 +55,7 @@ use OCP\Diagnostics\IEventLogger;
use OCP\IRequestId; use OCP\IRequestId;
use OCP\PreConditionNotMetException; use OCP\PreConditionNotMetException;
use OCP\Profiler\IProfiler; use OCP\Profiler\IProfiler;
use OCP\Server;
use Psr\Clock\ClockInterface; use Psr\Clock\ClockInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use function in_array; use function in_array;
@ -115,11 +116,11 @@ class Connection extends PrimaryReadReplicaConnection {
$this->tablePrefix = $params['tablePrefix']; $this->tablePrefix = $params['tablePrefix'];
$this->systemConfig = \OC::$server->getSystemConfig(); $this->systemConfig = \OC::$server->getSystemConfig();
$this->clock = \OCP\Server::get(ClockInterface::class); $this->clock = Server::get(ClockInterface::class);
$this->logger = \OC::$server->get(LoggerInterface::class); $this->logger = Server::get(LoggerInterface::class);
/** @var \OCP\Profiler\IProfiler */ /** @var \OCP\Profiler\IProfiler */
$profiler = \OC::$server->get(IProfiler::class); $profiler = Server::get(IProfiler::class);
if ($profiler->isEnabled()) { if ($profiler->isEnabled()) {
$this->dbDataCollector = new DbDataCollector($this); $this->dbDataCollector = new DbDataCollector($this);
$profiler->add($this->dbDataCollector); $profiler->add($this->dbDataCollector);
@ -143,7 +144,7 @@ class Connection extends PrimaryReadReplicaConnection {
$this->lastConnectionCheck[$this->getConnectionName()] = time(); $this->lastConnectionCheck[$this->getConnectionName()] = time();
// Only trigger the event logger for the initial connect call // Only trigger the event logger for the initial connect call
$eventLogger = \OC::$server->get(IEventLogger::class); $eventLogger = Server::get(IEventLogger::class);
$eventLogger->start('connect:db', 'db connection opened'); $eventLogger->start('connect:db', 'db connection opened');
/** @psalm-suppress InternalMethod */ /** @psalm-suppress InternalMethod */
$status = parent::connect(); $status = parent::connect();
@ -365,7 +366,7 @@ class Connection extends PrimaryReadReplicaConnection {
if ($logFile !== '' && is_writable(dirname($logFile)) && (!file_exists($logFile) || is_writable($logFile))) { if ($logFile !== '' && is_writable(dirname($logFile)) && (!file_exists($logFile) || is_writable($logFile))) {
$prefix = ''; $prefix = '';
if ($this->systemConfig->getValue('query_log_file_requestid') === 'yes') { if ($this->systemConfig->getValue('query_log_file_requestid') === 'yes') {
$prefix .= \OC::$server->get(IRequestId::class)->getId() . "\t"; $prefix .= Server::get(IRequestId::class)->getId() . "\t";
} }
// FIXME: Improve to log the actual target db host // FIXME: Improve to log the actual target db host
@ -665,7 +666,7 @@ class Connection extends PrimaryReadReplicaConnection {
$random = \OC::$server->getSecureRandom(); $random = \OC::$server->getSecureRandom();
$platform = $this->getDatabasePlatform(); $platform = $this->getDatabasePlatform();
$config = \OC::$server->getConfig(); $config = \OC::$server->getConfig();
$dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class); $dispatcher = Server::get(\OCP\EventDispatcher\IEventDispatcher::class);
if ($platform instanceof SqlitePlatform) { if ($platform instanceof SqlitePlatform) {
return new SQLiteMigrator($this, $config, $dispatcher); return new SQLiteMigrator($this, $config, $dispatcher);
} elseif ($platform instanceof OraclePlatform) { } elseif ($platform instanceof OraclePlatform) {