github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #64 from overleaf/bg-make-event-order-check-configurable

Browse source 
make event order check a configuration setting
This commit is contained in:
Brian Gough 2019-07-17 13:47:15 +01:00 committed by GitHub
commit b8c152ad12
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/real-time/app/coffee/DocumentUpdaterController.coffee
View file

@ -34,7 +34,7 @@ module.exports = DocumentUpdaterController =
logger.error {err: error, channel}, "error parsing JSON" logger.error {err: error, channel}, "error parsing JSON"
return return
if message.op? if message.op?
if message._id? if message._id? && settings.checkEventOrder
status = EventLogger.checkEventOrder("applied-ops", message._id, message) status = EventLogger.checkEventOrder("applied-ops", message._id, message)
if status is 'duplicate' if status is 'duplicate'
return # skip duplicate events return # skip duplicate events

2
services/real-time/app/coffee/WebsocketLoadBalancer.coffee
View file

@ -41,7 +41,7 @@ module.exports = WebsocketLoadBalancer =
if message.room_id == "all" if message.room_id == "all"
io.sockets.emit(message.message, message.payload...) io.sockets.emit(message.message, message.payload...)
else if message.room_id? else if message.room_id?
if message._id? if message._id? && Settings.checkEventOrder
status = EventLogger.checkEventOrder("editor-events", message._id, message) status = EventLogger.checkEventOrder("editor-events", message._id, message)
if status is "duplicate" if status is "duplicate"
return # skip duplicate events return # skip duplicate events

2
services/real-time/config/settings.defaults.coffee
View file

@ -52,6 +52,8 @@ settings =
continualPubsubTraffic: process.env['CONTINUAL_PUBSUB_TRAFFIC'] or false continualPubsubTraffic: process.env['CONTINUAL_PUBSUB_TRAFFIC'] or false
checkEventOrder: process.env['CHECK_EVENT_ORDER'] or false
sentry: sentry:
dsn: process.env.SENTRY_DSN dsn: process.env.SENTRY_DSN