tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #9667 from annando/profiler-network

Browse source 
Store the network profiler data
This commit is contained in:
Hypolite Petovan 2020-12-17 08:24:09 -05:00 committed by GitHub
parent 1414d43597 e22bb32247
commit 61c1c1f530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Network/HTTPRequest.php
View file

@ -76,6 +76,7 @@ class HTTPRequest implements IHTTPRequest
if (strlen($url) > 1000) { if (strlen($url) > 1000) {
$this->logger->debug('URL is longer than 1000 characters.', ['url' => $url, 'callstack' => System::callstack(20)]); $this->logger->debug('URL is longer than 1000 characters.', ['url' => $url, 'callstack' => System::callstack(20)]);
$this->profiler->saveTimestamp($stamp1, 'network');
return CurlResult::createErrorCurl(substr($url, 0, 200)); return CurlResult::createErrorCurl(substr($url, 0, 200));
} }
@ -94,12 +95,14 @@ class HTTPRequest implements IHTTPRequest
if (Network::isUrlBlocked($url)) { if (Network::isUrlBlocked($url)) {
$this->logger->info('Domain is blocked.', ['url' => $url]); $this->logger->info('Domain is blocked.', ['url' => $url]);
$this->profiler->saveTimestamp($stamp1, 'network');
return CurlResult::createErrorCurl($url); return CurlResult::createErrorCurl($url);
} }
$ch = @curl_init($url); $ch = @curl_init($url);
if (($redirects > 8) || (!$ch)) { if (($redirects > 8) || (!$ch)) {
$this->profiler->saveTimestamp($stamp1, 'network');
return CurlResult::createErrorCurl($url); return CurlResult::createErrorCurl($url);
} }
@ -201,6 +204,7 @@ class HTTPRequest implements IHTTPRequest
$redirects++; $redirects++;
$this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]); $this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
@curl_close($ch); @curl_close($ch);
$this->profiler->saveTimestamp($stamp1, 'network');
return $this->get($curlResponse->getRedirectUrl(), $opts, $redirects); return $this->get($curlResponse->getRedirectUrl(), $opts, $redirects);
} }
@ -224,12 +228,14 @@ class HTTPRequest implements IHTTPRequest
if (Network::isUrlBlocked($url)) { if (Network::isUrlBlocked($url)) {
$this->logger->info('Domain is blocked.' . ['url' => $url]); $this->logger->info('Domain is blocked.' . ['url' => $url]);
$this->profiler->saveTimestamp($stamp1, 'network');
return CurlResult::createErrorCurl($url); return CurlResult::createErrorCurl($url);
} }
$ch = curl_init($url); $ch = curl_init($url);
if (($redirects > 8) || (!$ch)) { if (($redirects > 8) || (!$ch)) {
$this->profiler->saveTimestamp($stamp1, 'network');
return CurlResult::createErrorCurl($url); return CurlResult::createErrorCurl($url);
} }
@ -289,6 +295,7 @@ class HTTPRequest implements IHTTPRequest
$redirects++; $redirects++;
$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]); $this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
curl_close($ch); curl_close($ch);
$this->profiler->saveTimestamp($stamp1, 'network');
return $this->post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout); return $this->post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
} }