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 'v4.3.4' into develop

Browse Source 
v4.3.4 v4.3.4
This commit is contained in:
Alexey Golubev
2017-05-15 16:48:18 +03:00
parent 89addfc806 5a4d4181f5
commit 86d5e0dd56
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DocService/sources/DocsCoServer.js
View File

@ -1662,21 +1662,22 @@ exports.install = function(server, callbackFunction) {
data.isCloseCoAuthoring = edit.ds_isCloseCoAuthoring; data.isCloseCoAuthoring = edit.ds_isCloseCoAuthoring;
} }
if (edit.user) { if (edit.user) {
var dataUser = data.user;
var user = edit.user; var user = edit.user;
if (null != user.id) { if (null != user.id) {
data.id = user.id; dataUser.id = user.id;
if (openCmd) { if (openCmd) {
openCmd.userid = user.id; openCmd.userid = user.id;
} }
} }
if (null != user.firstname) { if (null != user.firstname) {
data.firstname = user.firstname; dataUser.firstname = user.firstname;
} }
if (null != user.lastname) { if (null != user.lastname) {
data.lastname = user.lastname; dataUser.lastname = user.lastname;
} }
if (null != user.name) { if (null != user.name) {
data.username = user.name; dataUser.username = user.name;
} }
} }
} }

2
SpellChecker/sources/server.js
View File

@ -43,6 +43,7 @@ const c_nCheckHealth = 60000, c_sCheckWord = 'color', c_sCheckLang = 1033;
let idCheckInterval, canStartCheck = true; let idCheckInterval, canStartCheck = true;
let statusCheckHealth = true; let statusCheckHealth = true;
function checkHealth (worker) { function checkHealth (worker) {
logger.info('checkHealth');
if (!statusCheckHealth) { if (!statusCheckHealth) {
logger.error('error check health, restart!'); logger.error('error check health, restart!');
worker.kill(); worker.kill();
@ -52,6 +53,7 @@ function checkHealth (worker) {
statusCheckHealth = false; statusCheckHealth = false;
} }
function endCheckHealth (msg) { function endCheckHealth (msg) {
logger.info('endCheckHealth');
statusCheckHealth = true; statusCheckHealth = true;
} }