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

Merge branch 'hotfix/ds-version'

Browse Source
This commit is contained in:
Alexey Golubev
2016-10-20 15:39:00 +03:00
parent f38c883749 c1c87a3660
commit fc8ea886f9
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/sources/license.js
View File

@ -130,3 +130,5 @@ function* _updateFileState(state) {
const val = constants.PACKAGE_TYPE_OS === oPackageType ? redisKeyLicense : (state ? new Date(1) : new Date());
yield utils.promiseRedis(redisClient, redisClient.hset, redisKeyLicense, redisKeyLicense, val);
}
exports.buildVersion = buildVersion;
exports.buildNumber = buildNumber;

10
DocService/sources/DocsCoServer.js
View File

@ -84,6 +84,7 @@ const constants = require('./../../Common/sources/constants');
var utils = require('./../../Common/sources/utils');
var commonDefines = require('./../../Common/sources/commondefines');
var statsDClient = require('./../../Common/sources/statsdclient');
const license = require('./../../Common/sources/license');
var config = require('config').get('services.CoAuthoring');
var sqlBase = require('./baseConnector');
var canvasService = require('./canvasservice');
@ -2130,10 +2131,11 @@ exports.commandFromServer = function (req, res) {
var result = commonDefines.c_oAscServerCommandErrors.NoError;
var docId = 'null';
try {
var version = undefined;
var query = req.query;
// Ключ id-документа
docId = query.key;
if (null == docId) {
if (null == docId && 'version' != query.c) {
result = commonDefines.c_oAscServerCommandErrors.DocumentIdError;
} else {
logger.debug('Start commandFromServer: docId = %s c = %s', docId, query.c);
@ -2192,6 +2194,9 @@ exports.commandFromServer = function (req, res) {
result = commonDefines.c_oAscServerCommandErrors.NotModify;
}
break;
case 'version':
version = license.buildVersion + '.' + license.buildNumber;
break;
default:
result = commonDefines.c_oAscServerCommandErrors.UnknownCommand;
break;
@ -2201,7 +2206,8 @@ exports.commandFromServer = function (req, res) {
result = commonDefines.c_oAscServerCommandErrors.UnknownError;
logger.error('Error commandFromServer: docId = %s\r\n%s', docId, err.stack);
} finally {
var output = JSON.stringify({'key': req.query.key, 'error': result});
//undefined value are excluded in JSON.stringify
var output = JSON.stringify({'key': req.query.key, 'error': result, 'version': version});
logger.debug('End commandFromServer: docId = %s %s', docId, output);
var outputBuffer = new Buffer(output, 'utf8');
res.setHeader('Content-Type', 'application/json');