CITKParus/P8-ExchangeService
7
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

ЦИТК-659 - Возможность работы нескольких серверов параллельно

Browse Source
This commit is contained in:
Dollerino 2025-06-03 16:34:59 +03:00
parent 30f7d59623
commit 80af6bbd6d
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/app.js
View File

@ -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,

4
core/db_connector.js
View File

@ -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
});
//Если сервис интеграции разделяется на сервера

6
core/utils.js
View File

@ -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;

2
modules/parus_oracle_db.js
View File

@ -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

2
modules/parus_pg_db.js
View File

@ -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