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 tag 'ds-version' into develop

Browse Source 
ds-version

Conflicts:
	DocService/sources/DocsCoServer.js
This commit is contained in:
Alexey Golubev
2016-10-20 15:54:10 +03:00
parent 58dc987061 fc8ea886f9
commit c170316c61
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DocService/sources/DocsCoServer.js
View File

@ -83,6 +83,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');
@ -2222,6 +2223,7 @@ exports.commandFromServer = function (req, res) {
var result = commonDefines.c_oAscServerCommandErrors.NoError;
var docId = 'null';
try {
var version = undefined;
var params;
if (req.body && Buffer.isBuffer(req.body)) {
params = JSON.parse(req.body.toString('utf8'));
@ -2230,7 +2232,7 @@ exports.commandFromServer = function (req, res) {
}
// Ключ id-документа
docId = params.key;
if (null == docId) {
if (null == docId && 'version' != params.c) {
result = commonDefines.c_oAscServerCommandErrors.DocumentIdError;
} else {
logger.debug('Start commandFromServer: docId = %s c = %s', docId, params.c);
@ -2296,6 +2298,9 @@ exports.commandFromServer = function (req, res) {
result = commonDefines.c_oAscServerCommandErrors.UnknownError;
}
break;
case 'version':
version = license.buildVersion + '.' + license.buildNumber;
break;
default:
result = commonDefines.c_oAscServerCommandErrors.UnknownCommand;
break;
@ -2305,7 +2310,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': docId, 'error': result});
//undefined value are excluded in JSON.stringify
var output = JSON.stringify({'key': docId, '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');
@ -2313,4 +2319,4 @@ exports.commandFromServer = function (req, res) {
res.send(outputBuffer);
}
});
};
};