From 8f4541208ce3acdd5a877888d649680d64953a35 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Mon, 24 Dec 2018 16:01:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=20"=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8"=20=D1=80=D0=B5=D0=B7=D1=83?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D1=87=D0=B8=D0=BA=D0=BE=D0=B2=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/in_queue.js | 6 +++--- models/obj_in_queue.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/in_queue.js b/core/in_queue.js index 790a23d..d33d619 100644 --- a/core/in_queue.js +++ b/core/in_queue.js @@ -145,14 +145,14 @@ class InQueue extends EventEmitter { nExecState: objQueueSchema.NQUEUE_EXEC_STATE_APP_OK }); //Фиксируем успех исполнения - if (resBefore.blMsg) { + if (!_.isUndefined(resBefore.blMsg)) { blMsg = resBefore.blMsg; q = await this.dbConn.setQueueMsg({ nQueueId: q.nId, blMsg }); } - if (resBefore.blResp) { + if (!_.isUndefined(resBefore.blResp)) { blResp = resBefore.blResp; q = await this.dbConn.setQueueResp({ nQueueId: q.nId, @@ -217,7 +217,7 @@ class InQueue extends EventEmitter { nExecState: objQueueSchema.NQUEUE_EXEC_STATE_APP_OK }); //Фиксируем успех исполнения - if (resAfter.blResp) { + if (!_.isUndefined(resAfter.blResp)) { blResp = resAfter.blResp; q = await this.dbConn.setQueueResp({ nQueueId: q.nId, diff --git a/models/obj_in_queue.js b/models/obj_in_queue.js index 539ed13..300ea77 100644 --- a/models/obj_in_queue.js +++ b/models/obj_in_queue.js @@ -41,7 +41,7 @@ exports.InQueueProcessorFnAfter = new Schema({ //Обработанный ответ системы blResp: { type: Buffer, - required: true, + required: false, message: { type: path => `Обработанный ответ системы (${path}) имеет некорректный тип данных (ожидалось - Buffer)`, required: path => `Не указан обработанный ответ системы (${path})`