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