From 1d2ffb62a273f42f898d42e00f0bd0f18fb2146a Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 2 Apr 2025 13:46:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-936=20-=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=87=D0=B0=D0=B9=D0=BD=D0=BE=D0=B5=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/out_queue_processor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/out_queue_processor.js b/core/out_queue_processor.js index fa2621c..d19333b 100644 --- a/core/out_queue_processor.js +++ b/core/out_queue_processor.js @@ -360,8 +360,8 @@ const appProcess = async prms => { default: //Установим флаг возврата полного ответа (и тела и заголовков) options.resolveWithFullResponse = true; - //Установим таймаут подключения - options.timeout = prms.function.nTimeoutConn ? prms.function.nTimeoutConn : null; + //Установим таймаут подключения (если задан в настройках функции и ещё не задан в параметрах сообщения) + if (prms.function.nTimeoutConn && !options?.timeout) options.timeout = prms.function.nTimeoutConn; //Отправляем запрос serverResp = prms.function.nTimeoutAsynch ? await wrapPromiseTimeout(prms.function.nTimeoutAsynch, rqp(options))