valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/reduce-fetch-error-message' into 'master' 

Only include the exception message in 'UrlHelper::$fetch_last_error'.

See merge request tt-rss/tt-rss!20
This commit is contained in:
Andrew Dolgov 2024-01-13 18:27:19 +00:00
parent de214a01d2 8ef2803b27
commit d334023267
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/UrlHelper.php
View File

@ -391,12 +391,12 @@ class UrlHelper {
$response = $client->request($post_query ? 'POST' : 'GET', $url, $req_options); $response = $client->request($post_query ? 'POST' : 'GET', $url, $req_options);
} catch (\LengthException $ex) { } catch (\LengthException $ex) {
// Either 'Content-Length' indicated the download limit would be exceeded, or the transfer actually exceeded the download limit. // Either 'Content-Length' indicated the download limit would be exceeded, or the transfer actually exceeded the download limit.
self::$fetch_last_error = (string) $ex; self::$fetch_last_error = $ex->getMessage();
$span->setAttribute('error', self::$fetch_last_error); $span->setAttribute('error', self::$fetch_last_error);
$span->end(); $span->end();
return false; return false;
} catch (GuzzleHttp\Exception\GuzzleException $ex) { } catch (GuzzleHttp\Exception\GuzzleException $ex) {
self::$fetch_last_error = (string) $ex; self::$fetch_last_error = $ex->getMessage();
if ($ex instanceof GuzzleHttp\Exception\RequestException) { if ($ex instanceof GuzzleHttp\Exception\RequestException) {
if ($ex instanceof GuzzleHttp\Exception\BadResponseException) { if ($ex instanceof GuzzleHttp\Exception\BadResponseException) {