diff --git a/CoAuthoring/sources/baseConnector.js b/CoAuthoring/sources/baseConnector.js index dff5f758..d7b98918 100644 --- a/CoAuthoring/sources/baseConnector.js +++ b/CoAuthoring/sources/baseConnector.js @@ -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); diff --git a/CoAuthoring/sources/fontservice.js b/CoAuthoring/sources/fontservice.js index 9b22f6cf..9e1203e5 100644 --- a/CoAuthoring/sources/fontservice.js +++ b/CoAuthoring/sources/fontservice.js @@ -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;