pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Move runtimeConfig init to server start; Fix bug 75439

Browse Source
This commit is contained in:
Sergey Konovalov
2025-06-25 15:42:39 +03:00
parent dd8f4bc670
commit 69f923c7bb
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Common/sources/runtimeConfigManager.js
View File

@ -46,7 +46,6 @@ const configFileName = path.basename(configFilePath);
// Initialize cache with TTL and check for expired keys every minute
const nodeCache = new NodeCache(cfgRuntimeConfig.cache);
let isInitConfigWatcher = false;
/**
* Get runtime configuration for the current context
@ -54,10 +53,7 @@ let isInitConfigWatcher = false;
* @returns {Object} Runtime configuration object
*/
async function getConfigFromFile(ctx) {
if (!isInitConfigWatcher) {
isInitConfigWatcher = true;
initConfigWatcher(ctx);
}
try {
const configData = await fs.readFile(configFilePath, 'utf8');
return JSON.parse(configData);
@ -116,20 +112,20 @@ function handleConfigFileChange(eventType, filename) {
/**
* Initialize the configuration directory watcher
*/
function initConfigWatcher(ctx) {
function initRuntimeConfigWatcher(ctx) {
try {
const configDir = path.dirname(configFilePath);
const watcher = fsWatch.watch(configDir, handleConfigFileChange);
watcher.on('error', (err) => {
ctx.logger.error(`initConfigWatcher error: ${err.message}`);
ctx.logger.error(`initRuntimeConfigWatcher error: ${err.message}`);
});
ctx.logger.info(`initConfigWatcherWatching for changes in: ${configDir}`);
ctx.logger.info(`watching for runtime config changes in: ${configDir}`);
} catch (watchErr) {
ctx.logger.error(`initConfigWatcher error: ${watchErr.message}`);
ctx.logger.error(`initRuntimeConfigWatcher error: ${watchErr.message}`);
}
}
module.exports = {
initRuntimeConfigWatcher,
getConfig,
saveConfig
};

5
DocService/sources/DocsCoServer.js
View File

@ -101,6 +101,7 @@ const pubsubService = require('./pubsubRabbitMQ');
const wopiClient = require('./wopiClient');
const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
const operationContext = require('./../../Common/sources/operationContext');
const runtimeConfigManager = require('./../../Common/sources/runtimeConfigManager');
const tenantManager = require('./../../Common/sources/tenantManager');
const { notificationTypes, ...notificationService } = require('../../Common/sources/notificationService');
const aiProxyHandler = require('./ai/aiProxyHandler');
@ -3999,7 +4000,9 @@ exports.install = function(server, callbackFunction) {
);
});
});
//Initialize watch here to avoid circular import with operationContext
runtimeConfigManager.initRuntimeConfigWatcher(operationContext.global);
void aiProxyHandler.getPluginSettings(operationContext.global);
};
exports.setLicenseInfo = async function(globalCtx, data, original) {