Merge pull request #14 from open-runtimes/fix-timeout

Fix: Add timeout config

Author: christyjacob4

.env

@@ -3,6 +3,7 @@ OPR_PROXY_WORKER_PER_CORE=6
 OPR_PROXY_EXECUTORS=mockoon1,mockoon2
 OPR_PROXY_HEALTHCHECK=enabled
 OPR_PROXY_HEALTHCHECK_INTERVAL=5000
+OPR_PROXY_MAX_TIMEOUT=600
 OPR_PROXY_ENV=development
 OPR_PROXY_SECRET=proxy-secret-key
 OPR_PROXY_EXECUTOR_SECRET=executor-secret-key

README.md

@@ -47,6 +47,7 @@ services:
       - OPR_PROXY_WORKER_PER_CORE
       - OPR_PROXY_EXECUTORS
       - OPR_PROXY_HEALTHCHECK_INTERVAL
+      - OPR_PROXY_MAX_TIMEOUT
       - OPR_PROXY_ENV
       - OPR_PROXY_EXECUTOR_SECRET
       - OPR_PROXY_SECRET
@@ -111,6 +112,7 @@ docker compose down
 | OPR_PROXY_EXECUTORS            | Comma-separated hostnames of servers under the proxy.                                                                                     |
 | OPR_PROXY_HEALTHCHECK          | Health check by HTTP request to /v1/health. 'enabled' by default. To disable, set to 'disabled'.                                          |
 | OPR_PROXY_HEALTHCHECK_INTERVAL | Delay in milliseconds between health checks. 10000 by default. Only relevant if OPR_PROXY_HEALTHCHECK is 'enabled'.                       |
+| OPR_PROXY_MAX_TIMEOUT | Maximum timeout in seconds for communication between proxy and executor. Default is 600 seconds.                       |
 | OPR_PROXY_ENV                  | Runtime environment. 'production' or 'development'. Development may expose debug information and is not recommended on production server. |
 | OPR_PROXY_SECRET               | Secret that needs to be provided in `Authroization` header when communicating with the to proxy.                                          |
 | OPR_PROXY_EXECUTOR_SECRET      | String provided as `authorization` header by proxy when sending request to executor.                                                      |

app/http.php

@@ -303,6 +303,7 @@ function logError(Throwable $error, string $action, ?Logger $logger, Utopia\Rout
         \curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         \curl_setopt($ch, CURLOPT_HEADER, true);
         \curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+        \curl_setopt($ch, CURLOPT_TIMEOUT, \intval(App::getEnv('OPR_PROXY_MAX_TIMEOUT', '900')));
 
         $curlHeaders = [];
         foreach ($headers as $header => $value) {
@@ -326,7 +327,7 @@ function logError(Throwable $error, string $action, ?Logger $logger, Utopia\Rout
         \curl_close($ch);
 
         if ($errNo !== 0) {
-            throw new Exception('Unexpected curl error between proxy and executor: ' . $error);
+            throw new Exception('Unexpected curl error between proxy and executor ID ' . $hostname . ' (' . $errNo .  '): ' . $error);
         }
 
         if (!empty($headers)) {

docker-compose.yml

@@ -31,6 +31,7 @@ services:
       - OPR_PROXY_WORKER_PER_CORE
       - OPR_PROXY_EXECUTORS
       - OPR_PROXY_HEALTHCHECK_INTERVAL
+      - OPR_PROXY_MAX_TIMEOUT
       - OPR_PROXY_ENV
       - OPR_PROXY_EXECUTOR_SECRET
       - OPR_PROXY_SECRET