From 80af6bbd6d210b0e5f56863bdef313eb48da55e9 Mon Sep 17 00:00:00 2001
From: Dollerino <dollerok101@gmail.com>
Date: Tue, 3 Jun 2025 16:34:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-659=20-=20=D0=92=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=B8=D1=85=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BB=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/app.js                | 4 ++--
 core/db_connector.js       | 4 ++--
 core/utils.js              | 6 ------
 modules/parus_oracle_db.js | 2 +-
 modules/parus_pg_db.js     | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/app.js b/core/app.js
index bbba0e4..e3fb918 100644
--- a/core/app.js
+++ b/core/app.js
@@ -203,8 +203,8 @@ class ParusAppServer {
                     ...prms.config.dbConnect,
                     exsSrv: {
                         sServerName: prms.config.common.sServerName,
-                        sServerIP: `порт - ${prms.config.inComing.nPort}, доступные IP - ${
-                            prms.config.inComing.sHost === "0.0.0.0" ? getIPs().join("; ") : prms.config.inComing.sHost
+                        sServerIP: `${prms.config.inComing.nPort};${
+                            prms.config.inComing.sHost === "0.0.0.0" ? getIPs().join(";") : prms.config.inComing.sHost
                         }`
                     },
                     sRelease: prms.config.common.sRelease,
diff --git a/core/db_connector.js b/core/db_connector.js
index 502309e..789c38c 100644
--- a/core/db_connector.js
+++ b/core/db_connector.js
@@ -10,7 +10,7 @@
 const _ = require("lodash"); //Работа с массивами и объектами
 const EventEmitter = require("events"); //Обработчик пользовательских событий
 const { ServerError } = require("./server_errors"); //Типовая ошибка
-const { makeModuleFullPath, makeServerModuleName, validateObject } = require("./utils"); //Вспомогательные функции
+const { makeModuleFullPath, validateObject } = require("./utils"); //Вспомогательные функции
 const prmsDBConnectorSchema = require("../models/prms_db_connector"); //Схемы валидации параметров функций модуля
 const intfDBConnectorModuleSchema = require("../models/intf_db_connector_module"); //Схема валидации интерфейса модуля взаимодействия с БД
 const objServiceSchema = require("../models/obj_service"); //Схема валидации сервиса
@@ -110,7 +110,7 @@ class DBConnector extends EventEmitter {
                         sRelease: this.connectSettings.sRelease,
                         nWorkers: this.connectSettings.nMaxWorkers,
                         sServerName: this.connectSettings.exsSrv.sServerName,
-                        sModuleName: makeServerModuleName(this.connectSettings.sSessionAppName, this.connectSettings.exsSrv.sServerName),
+                        sSessionAppName: this.connectSettings.sSessionAppName,
                         connection: this.connection
                     });
                     //Если сервис интеграции разделяется на сервера
diff --git a/core/utils.js b/core/utils.js
index 38ec916..9e19326 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -77,11 +77,6 @@ const makeModuleFullPath = sModuleName => {
     }
 };
 
-//Формирование наименование модуля сессии
-const makeServerModuleName = (sSessionAppName, sServerName) => {
-    return sServerName ? `${sSessionAppName}$${sServerName}` : sSessionAppName;
-};
-
 //Формирование текста ошибки
 const makeErrorText = e => {
     //Сообщение об ошибке по умолчанию
@@ -430,7 +425,6 @@ const wrapPromiseTimeout = (timeout, promise) => {
 
 exports.validateObject = validateObject;
 exports.makeModuleFullPath = makeModuleFullPath;
-exports.makeServerModuleName = makeServerModuleName;
 exports.makeErrorText = makeErrorText;
 exports.getAppSrvModuleName = getAppSrvModuleName;
 exports.getAppSrvFunctionName = getAppSrvFunctionName;
diff --git a/modules/parus_oracle_db.js b/modules/parus_oracle_db.js
index 76d1841..c425ebb 100644
--- a/modules/parus_oracle_db.js
+++ b/modules/parus_oracle_db.js
@@ -134,7 +134,7 @@ const checkAppStart = async prms => {
             SEXS_RELEASE_DATE: prms.sRelease,
             NWORKERS: prms.nWorkers,
             SEXSSRV: prms.sServerName,
-            SMODULE_NAME: prms.sModuleName
+            SSESSION_APP_NAME: prms.sSessionAppName
         },
         outPrms: {
             SERR_TEXT: DT_VARCHAR
diff --git a/modules/parus_pg_db.js b/modules/parus_pg_db.js
index 901737a..cdab6a7 100644
--- a/modules/parus_pg_db.js
+++ b/modules/parus_pg_db.js
@@ -140,7 +140,7 @@ const checkAppStart = async prms => {
             SEXS_RELEASE_DATE: prms.sRelease,
             NWORKERS: prms.nWorkers,
             SEXSSRV: prms.sServerName !== "" ? prms.sServerName : null,
-            SMODULE_NAME: prms.sModuleName
+            SSESSION_APP_NAME: prms.sSessionAppName
         },
         outPrms: {
             SERR_TEXT: DT_VARCHAR