From fd88819eec3aa78096555336f26aa9edf541ebb2 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 20 Aug 2020 14:03:03 +0100 Subject: [PATCH 1/2] [Router] _handleError: ol_context.doc_id does not exist, drop overwrite --- services/real-time/app/js/Router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/real-time/app/js/Router.js b/services/real-time/app/js/Router.js index ae10d12e2b..a39cd39171 100644 --- a/services/real-time/app/js/Router.js +++ b/services/real-time/app/js/Router.js @@ -27,7 +27,7 @@ let Router module.exports = Router = { _handleError(callback, error, client, method, attrs) { attrs = attrs || {} - for (const key of ['project_id', 'doc_id', 'user_id']) { + for (const key of ['project_id', 'user_id']) { attrs[key] = client.ol_context[key] } attrs.client_id = client.id From f935b1881a00ce39e5c4df7e8b772858fee5053c Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 20 Aug 2020 14:05:12 +0100 Subject: [PATCH 2/2] [Router] leaveDoc: pass the doc_id into the error-context --- services/real-time/app/js/Router.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/real-time/app/js/Router.js b/services/real-time/app/js/Router.js index a39cd39171..dca3794368 100644 --- a/services/real-time/app/js/Router.js +++ b/services/real-time/app/js/Router.js @@ -274,7 +274,9 @@ module.exports = Router = { WebsocketController.leaveDoc(client, doc_id, function (err, ...args) { if (err) { - Router._handleError(callback, err, client, 'leaveDoc') + Router._handleError(callback, err, client, 'leaveDoc', { + doc_id + }) } else { callback(null, ...args) }