try curl requests several times

arrilot · Mar 17, 2019 · ef4f37e · ef4f37e
1 parent 859a2f3
commit ef4f37e
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 33 deletions.
diff --git a/src/Checks/Check.php b/src/Checks/Check.php
@@ -4,6 +4,7 @@
 
 use Arrilot\BitrixSystemCheck\Monitorings\DataStorage;
 use Arrilot\BitrixSystemCheck\Exceptions\SkipCheckException;
+use RuntimeException;
 
 abstract class Check
 {
@@ -147,4 +148,60 @@ protected function inConsole()
     {
         return php_sapi_name() === 'cli';
     }
+
+    /**
+     * Attempt to run $callable $times times with $interval seconds interval until first successful attempt.
+     *
+     * @param callable $callable
+     * @param int $times
+     * @param int $interval - in seconds
+     * @return mixed
+     */
+    protected function attempt(callable $callable, $times, $interval = 1)
+    {
+        $lastError = '';
+        foreach (range(1, $times) as $i) {
+            try {
+                return $callable($i, $times);
+            } catch (RuntimeException $e) {
+                $lastError = $e->getMessage();
+                sleep($interval);
+            }
+        }
+
+        $this->logError($lastError);
+
+        return null;
+    }
+
+    /**
+     * @param string $url
+     * @param null|string $basicAuth
+     * @return null|array
+     */
+    protected function getCurlInfo($url, $basicAuth = null)
+    {
+        return $this->attempt(function () use ($url, $basicAuth) {
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_TIMEOUT_MS, 10000);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+
+            if ($basicAuth) {
+                curl_setopt($ch, CURLOPT_USERPWD, $basicAuth);
+            }
+
+            $result = curl_exec($ch);
+            if (!$result) {
+                $this->logError('При curl запросе к '. $url . ' произошла ошибка ' . curl_error($ch));
+                curl_close($ch);
+                return false;
+            }
+            $info = curl_getinfo($ch);
+            curl_close($ch);
+            return $info;
+        }, 3);
+    }
 }
diff --git a/src/Checks/Custom/HttpsRedirect.php b/src/Checks/Custom/HttpsRedirect.php
@@ -3,6 +3,7 @@
 namespace Arrilot\BitrixSystemCheck\Checks\Custom;
 
 use Arrilot\BitrixSystemCheck\Checks\Check;
+use RuntimeException;
 
 class HttpsRedirect extends Check
 {
@@ -35,27 +36,15 @@ public function name()
      */
     public function run()
     {
-        $ch = curl_init();
         $url = str_replace('https://', 'http://', $this->mainPage);
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_TIMEOUT_MS, 10000);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-
-        if ($this->basicAuth) {
-            curl_setopt($ch, CURLOPT_USERPWD, $this->basicAuth);
+        $info = $this->getCurlInfo($url, $this->basicAuth);
+        if (is_null($info)) {
+            return false;
         }
 
-        $result = curl_exec($ch);
-        if (!$result) {
-            $this->logError('При curl запросе к '. $url . ' произошла ошибка ' . curl_error($ch));
-            curl_close($ch);
+        if (is_null($info)) {
             return false;
         }
-        $info = curl_getinfo($ch);
-        curl_close($ch);
 
         if ($info['http_code'] !== 301 && $info['http_code'] !== 302) {
             $this->logError('При curl запросе к '. $url . ' получен код ответа ' . $info['http_code'] . ' вместо 301/302');

diff --git a/src/Checks/Custom/WwwRedirect.php b/src/Checks/Custom/WwwRedirect.php
@@ -3,6 +3,7 @@
 namespace Arrilot\BitrixSystemCheck\Checks\Custom;
 
 use Arrilot\BitrixSystemCheck\Checks\Check;
+use RuntimeException;
 
 class WwwRedirect extends Check
 {
@@ -43,29 +44,14 @@ public function name()
      */
     public function run()
     {
-        $ch = curl_init();
         $url = $this->reverse
             ? str_replace(['http://www.', 'https://www.'], ['http://', 'https://'], $this->mainPage)
             : str_replace(['http://', 'https://'], ['http://www.', 'https://www.'], $this->mainPage);
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_TIMEOUT_MS, 10000);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-
-        if ($this->basicAuth) {
-            curl_setopt($ch, CURLOPT_USERPWD, $this->basicAuth);
-        }
 
-        $result = curl_exec($ch);
-        if (!$result) {
-            $this->logError('При curl запросе к '. $url . ' произошла ошибка ' . curl_error($ch));
-            curl_close($ch);
+        $info = $this->getCurlInfo($url, $this->basicAuth);
+        if (is_null($info)) {
             return false;
         }
-        $info = curl_getinfo($ch);
-        curl_close($ch);
 
         if ($info['http_code'] !== 301 && $info['http_code'] !== 302) {
             $this->logError('При curl запросе к '. $url . ' получен код ответа ' . $info['http_code'] . ' вместо 301/302');