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

Правки для config

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@64457 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2015-09-01 16:14:33 +00:00
committed by Alexander.Trofimov
parent cce863d624
commit 90755f04d2
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
FileConverter/sources/converter.js
View File

@ -6,7 +6,9 @@ var http = require('http');
var https = require('https');
var url = require('url');
var childProcess = require('child_process');
var configCommon = require('./../../Common/sources/config.json');
var config = require('config');
var configConverter = config.get('FileConverter.converter');
var commonDefines = require('./../../Common/sources/commondefines');
var storage = require('./../../Common/sources/storage-base');
var formatChecker = require('./../../Common/sources/formatchecker');
@ -15,17 +17,15 @@ var logger = require('./../../Common/sources/logger');
var constants = require('./../../Common/sources/constants');
var nodeZip = require('./../../Common/node_modules/node-zip');
var baseConnector = require('./../../CoAuthoring/sources/baseConnector');
var config = require('./config.json');
var queueService = require('./../../Common/sources/' + configCommon['queue']['name']);
var queueService = require('./../../Common/sources/' + config.get('queue.name'));
var configConverter = config['converter'];
var cfgMaxDownloadBytes = configConverter['maxDownloadBytes'] || 100000000;
var cfgDownloadTimeout = configConverter['downloadTimeout'] || 60;
var cfgFontDir = configConverter['fontDir'];
var cfgPresentationThemesDir = configConverter['presentationThemesDir'];
var cfgFilePath = configConverter['filePath'];
var cfgArgs = configConverter['args'];
var cfgErrorFiles = configConverter['errorfiles'];
var cfgMaxDownloadBytes = configConverter.has('maxDownloadBytes') ? configConverter.get('maxDownloadBytes') : 100000000;
var cfgDownloadTimeout = configConverter.has('downloadTimeout') ? configConverter.get('downloadTimeout') : 60;
var cfgFontDir = configConverter.get('fontDir');
var cfgPresentationThemesDir = configConverter.get('presentationThemesDir');
var cfgFilePath = configConverter.get('filePath');
var cfgArgs = configConverter.get('args');
var cfgErrorFiles = configConverter.get('errorfiles');
var TEMP_PREFIX = 'ASC_CONVERT';
var queue = null;

4
FileConverter/sources/convertermaster.js
View File

@ -1,9 +1,9 @@
var cluster = require('cluster');
var numCPUs = require('os').cpus().length;
var logger = require('./../../Common/sources/logger');
var config = require('./config.json');
var config = require('config').get('FileConverter.converter');
var cfgMaxProcessCount = config['converter']['maxprocesscount'];
var cfgMaxProcessCount = config.get('maxprocesscount');
var workersCount = Math.ceil(numCPUs * cfgMaxProcessCount);