From 2251a12c9133679b93eca465f58347c81a145027 Mon Sep 17 00:00:00 2001 From: Mim Date: Mon, 29 Jun 2026 17:30:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F8-64251=20-=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BE=D1=81=D0=B2=D0=BE=D0=B1=D0=BE=D0=B6=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D1=87=D0=B8=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B1=D1=80=D0=BE=D1=81=D0=B5=20=D1=84=D0=BB=D0=B0=D0=B3=D0=B0?= =?UTF-8?q?=20"=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D1=82=D1=8C=20?= =?UTF-8?q?=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=BE=D0=B5=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/logger.js | 4 ++++ core/out_queue.js | 12 ++++++++---- modules/parus_oracle_db.js | 1 + modules/parus_pg_db.js | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/logger.js b/core/logger.js index e836bc9..b90c279 100644 --- a/core/logger.js +++ b/core/logger.js @@ -82,6 +82,10 @@ class Logger { } } catch (e) { console.log(SCONSOLE_LOG_COLOR_PATTERN_ERR, `${sNow} ОШИБКА ПРОТОКОЛИРОВАНИЯ: `, e.sMessage); + try { + if (this.dbConnector && this.dbConnector.bConnected) + await this.dbConnector.putLog({ nLogState: NLOG_STATE_ERR, sMsg: `ОШИБКА ПРОТОКОЛИРОВАНИЯ: ${e.sMessage}` }); + } catch {} } } } else { diff --git a/core/out_queue.js b/core/out_queue.js index 66abf43..4378edd 100644 --- a/core/out_queue.js +++ b/core/out_queue.js @@ -204,10 +204,14 @@ class OutQueue extends EventEmitter { else await this.logger.info(message, logData); } //Сбрасываем признак "В работе" позиции очереди - await this.dbConn.setInProgress({ - nQueueId: prms.nQueueId, - nInProgress: objQueueSchema.NQUEUE_IN_PROGRESS_NO - }); + try { + await this.dbConn.setInProgress({ + nQueueId: prms.nQueueId, + nInProgress: objQueueSchema.NQUEUE_IN_PROGRESS_NO + }); + } catch (e) { + this.logger.error(`При сбросе признака "В работе" для исходящего сообщения ${prms.nQueueId}: ${makeErrorText(e)}`); + } //Увеличиваем количество доступных обработчиков this.nWorkersLeft++; } else { diff --git a/modules/parus_oracle_db.js b/modules/parus_oracle_db.js index 0f95906..89a77c0 100644 --- a/modules/parus_oracle_db.js +++ b/modules/parus_oracle_db.js @@ -418,6 +418,7 @@ const setInProgress = async prms => { connection: prms.connection, sName: "PKG_EXS.QUEUE_IN_PROGRESS_SET", inPrms: { + NFLAG_SMART: 1, NEXSQUEUE: prms.nQueueId, NIN_PROGRESS: prms.nInProgress } diff --git a/modules/parus_pg_db.js b/modules/parus_pg_db.js index b3fb477..fa9aaff 100644 --- a/modules/parus_pg_db.js +++ b/modules/parus_pg_db.js @@ -379,6 +379,7 @@ const setInProgress = async prms => { connection: prms.connection, sName: "PKG_EXS$QUEUE_IN_PROGRESS_SET", inPrms: { + NFLAG_SMART: 1, NEXSQUEUE: prms.nQueueId, NIN_PROGRESS: prms.nInProgress }