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@64452 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Alexey.Golubev
2015-09-01 15:57:05 +00:00
committed by Alexander.Trofimov
parent 5dc6596cc5
commit afacb2358e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CoAuthoring/sources/baseConnector.js
View File

@ -3,17 +3,16 @@ var sqlDataBaseType = {
postgreSql : 'postgres'
};
var config = require('config');
var configSql = config['sql'];
var baseConnector = (sqlDataBaseType.mySql === configSql['type']) ? require('./mySqlBaseConnector') : require('./postgreSqlBaseConnector');
var config = require('config').get('services.CoAuthoring.sql');
var baseConnector = (sqlDataBaseType.mySql === config.get('type')) ? require('./mySqlBaseConnector') : require('./postgreSqlBaseConnector');
var tableChanges = configSql['tableChanges'],
tableCallbacks = configSql['tableCallbacks'],
tableResult = configSql['tableResult'],
tablePucker = configSql['tablePucker'];
var tableChanges = config.get('tableChanges'),
tableCallbacks = config.get('tableCallbacks'),
tableResult = config.get('tableResult'),
tablePucker = config.get('tablePucker');
var g_oCriticalSection = {};
var maxPacketSize = configSql['max_allowed_packet']; // Размер по умолчанию для запроса в базу данных 1Mb - 1 (т.к. он не пишет 1048575, а пишет 1048574)
var maxPacketSize = config.get('max_allowed_packet'); // Размер по умолчанию для запроса в базу данных 1Mb - 1 (т.к. он не пишет 1048575, а пишет 1048574)
function getDataFromTable (tableId, data, getCondition, callback) {
var table = getTableById(tableId);

8
CoAuthoring/sources/fontservice.js
View File

@ -6,11 +6,11 @@ var base64 = require('base64-stream');
var utils = require('./../../Common/sources/utils');
var formatChecker = require('./../../Common/sources/formatchecker');
var logger = require('./../../Common/sources/logger');
var config = require('./config.json');
var config = require('config').get('services.CoAuthoring.utils');
var cfgFontDir = config['utils']['utils.common.fontdir'];
var cfgSearchPatterns = config['utils']['utils.fonts.search_patterns'];
var cfgResourceExpires = config['utils']['resource.expires'];
var cfgFontDir = config.get('utils.common.fontdir');
var cfgSearchPatterns = config.get('utils.fonts.search_patterns');
var cfgResourceExpires = config.get('resource.expires');
var JS_EXTENTION = '.js';
var BYTE_MAX_VALUE = 255;