From f5a6b678960878322d6d5ac72e218a1a2ce27521 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Tue, 27 Nov 2018 18:59:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=B4=D0=B5=D0=BB=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=20=D0=BE=D1=82=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9,=20=D0=BF=D1=80=D0=B8=D0=BD=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=20=D1=81=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=BD=D0=BE=D0=B2=D0=B5=D0=BD=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20(=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=B1=D1=8B=D1=82=D1=8C=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B5=20=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D0=B5=D1=82=20?=
 =?UTF-8?q?=D1=8D=D1=82=D0=BE=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/index.js b/index.js
index c64dca6..41346e6 100644
--- a/index.js
+++ b/index.js
@@ -10,12 +10,14 @@
 require("module-alias/register"); //Поддержка псевонимов при подключении модулей
 const cfg = require("./config"); //Настройки сервера приложений
 const app = require("./core/app"); //Сервер приложений
+const { ServerError } = require("./core/server_errors"); //Типовая ошибка
+const { SERR_UNEXPECTED } = require("./core/constants"); //Общесистемные константы
 
 //--------------------------
 // Глобальные идентификаторы
 //--------------------------
 
-let appSrv = new app.ParusAppServer(cfg); //Экземпляр сервера приложений
+let appSrv = new app.ParusAppServer(); //Экземпляр сервера приложений
 
 //----------------------------------------
 // Управление процессом сервера приложений
@@ -39,8 +41,19 @@ process.on("SIGINT", () => {
 
 //Старутем
 appSrv
-    .run()
-    .then(r => {})
+    .init(cfg)
+    .then(r => {
+        appSrv
+            .run()
+            .then(r => {})
+            .catch(e => {
+                if (e instanceof ServerError) appSrv.logger.error(e.sCode + ": " + e.sMessage);
+                else appSrv.logger.error(SERR_UNEXPECTED + ": " + e.message);
+                appSrv.stop();
+            });
+    })
     .catch(e => {
-        appSrv.logger.error("НЕОЖИДАННАЯ ОШИБКА: " + e);
+        if (e instanceof ServerError) appSrv.logger.error(e.sCode + ": " + e.sMessage);
+        else appSrv.logger.error(SERR_UNEXPECTED + ": " + e.message);
+        appSrv.stop();
     });