mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-04 20:27:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1341 from alexandrmazur96/rework_curl_util

Browse Source 
Change Curl\Util for return response from cURL request.
This commit is contained in:
Jordi Boggiano
2019-07-05 17:49:31 +02:00
committed by GitHub
parent 33ae80beeb c2249121dc
commit c37ff2a96f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Monolog/Handler/Curl/Util.php
View File

@@ -31,13 +31,16 @@ final class Util
/** /**
* Executes a CURL request with optional retries and exception on failure * Executes a CURL request with optional retries and exception on failure
* *
* @param resource $ch curl handler * @param resource $ch curl handler
* @throws \RuntimeException * @param int $retries
* @param bool $closeAfterDone
* @return bool|string @see curl_exec
*/ */
public static function execute($ch, int $retries = 5, bool $closeAfterDone = true): void public static function execute($ch, int $retries = 5, bool $closeAfterDone = true)
{ {
while ($retries--) { while ($retries--) {
if (curl_exec($ch) === false) { $curlResponse = curl_exec($ch);
if ($curlResponse === false) {
$curlErrno = curl_errno($ch); $curlErrno = curl_errno($ch);
if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) { if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) {
@@ -56,7 +59,10 @@ final class Util
if ($closeAfterDone) { if ($closeAfterDone) {
curl_close($ch); curl_close($ch);
} }
break;
return $curlResponse;
} }
return false;
} }
} }