From ea74ff4ed144bdb5cf520dd885e50bebe87e91b7 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Thu, 15 Nov 2018 19:39:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84?=
 =?UTF-8?q?=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js            | 4 ++--
 core/db_connector.js | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config.js b/config.js
index 523f365..2ee0e4b 100644
--- a/config.js
+++ b/config.js
@@ -16,9 +16,9 @@ let dbConnect = {
     //Строка подключения к БД
     connectString: "DEMOP_CITKSERV_WAN",
     //Наименование модуля (для сессии БД)
-    moduleName: "PARUS$ExchangeServer",
+    sessionModuleName: "PARUS$ExchangeServer",
     //Подключаемый модуль обслуживания БД (низкоуровневые функции работы с СУБД)
-    module: "parus_oracle_db.js"
+    connectorModule: "parus_oracle_db.js"
 };
 
 //Параметры обработки очереди исходящих сообщений
diff --git a/core/db_connector.js b/core/db_connector.js
index 0e2e14a..cc4d01d 100644
--- a/core/db_connector.js
+++ b/core/db_connector.js
@@ -34,15 +34,16 @@ class DBConnector {
                 { name: "user", required: true },
                 { name: "password", required: true },
                 { name: "connectString", required: true },
-                { name: "module", required: false }
+                { name: "sessionModuleName", required: true },
+                { name: "connectorModule", required: false }
             ]
         });
         //Если структура объекта в норме
         if (!checkResult) {
             //Проверяем наличие модуля для работы с БД в настройках подключения
-            if (dbConnect.module) {
+            if (dbConnect.connectorModule) {
                 //Подключим модуль
-                this.connector = require(makeModuleFullPath(dbConnect.module));
+                this.connector = require(makeModuleFullPath(dbConnect.connectorModule));
                 //Проверим его интерфейс
                 if (
                     !checkModuleInterface(this.connector, {
@@ -88,7 +89,7 @@ class DBConnector {
                 this.connectSettings.user,
                 this.connectSettings.password,
                 this.connectSettings.connectString,
-                this.connectSettings.moduleName
+                this.connectSettings.sessionModuleName
             );
             return this.connection;
         } catch (e) {