archive/nextcloud_server
0
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-03-15 00:43:23 +00:00
Code Issues Projects Releases Wiki Activity

feat(http-client): expose default request timeout constant to be used instead of magic number 30

Browse source 
Will be used to set default where we are able to override the default timeout.

See https://github.com/nextcloud/server/pull/48418

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2024-10-10 07:54:46 +02:00
parent d013a13eb5
commit dcd27fd986
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
3 changed files with 11 additions and 2 deletions
lib
private
Files/Storage
DAV.php
Http/Client
Client.php
public/Http/Client
IClient.php

3
lib/private/Files/Storage/DAV.php
View file

@ -20,6 +20,7 @@ use OCP\Files\ForbiddenException;
use OCP\Files\IMimeTypeDetector;
use OCP\Files\StorageInvalidException;
use OCP\Files\StorageNotAvailableException;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\ICertificateManager;
use OCP\IConfig;
@ -124,7 +125,7 @@ class DAV extends Common {
$this->logger = Server::get(LoggerInterface::class);
$this->eventLogger = Server::get(IEventLogger::class);
// This timeout value will be used for the download and upload of files
$this->timeout = Server::get(IConfig::class)->getSystemValueInt('davstorage.request_timeout', 30);
$this->timeout = Server::get(IConfig::class)->getSystemValueInt('davstorage.request_timeout', IClient::DEFAULT_REQUEST_TIMEOUT);
$this->mimeTypeDetector = \OC::$server->getMimeTypeDetector();
}

2
lib/private/Http/Client/Client.php
View file

@ -53,7 +53,7 @@ class Client implements IClient {
$defaults = [
RequestOptions::VERIFY => $this->getCertBundle(),
RequestOptions::TIMEOUT => 30,
RequestOptions::TIMEOUT => IClient::DEFAULT_REQUEST_TIMEOUT,
];
$options['nextcloud']['allow_local_address'] = $this->isLocalAddressAllowed($options);

8
lib/public/Http/Client/IClient.php
View file

@ -14,6 +14,14 @@ namespace OCP\Http\Client;
* @since 8.1.0
*/
interface IClient {
/**
* Default request timeout for requests
*
* @since 31.0.0
*/
public const DEFAULT_REQUEST_TIMEOUT = 30;
/**
* Sends a GET request
* @param string $uri