From c83607ba8fa0d2ddc75ed4cff37ea2a249b90a13 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Fri, 7 Dec 2018 13:53:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BD=D0=B8=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/utils.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/utils.js b/core/utils.js index 0252ece..51fcb7e 100644 --- a/core/utils.js +++ b/core/utils.js @@ -9,7 +9,8 @@ const _ = require("lodash"); //Работа с массивами и объектами const Schema = require("validate"); //Схемы валидации -const { SMODULES_PATH_MODULES } = require("./constants"); //Глобавльные константы системы +const { SERR_UNEXPECTED, SMODULES_PATH_MODULES } = require("./constants"); //Глобавльные константы системы +const { ServerError } = require("./server_errors"); //Ошибка сервера //------------ // Тело модуля @@ -56,9 +57,17 @@ const makeModuleFullPath = sModuleName => { } }; +//Формирование текста ошибки +const makeErrorText = e => { + let sErr = `${SERR_UNEXPECTED}: ${e.message}`; + if (e instanceof ServerError) sErr = `${e.sCode}: ${e.sMessage}`; + return sErr; +}; + //----------------- // Интерфейс модуля //----------------- exports.validateObject = validateObject; exports.makeModuleFullPath = makeModuleFullPath; +exports.makeErrorText = makeErrorText;