Explorar o código

[Router] gracefully set and do not reset the ol_context

Jakob Ackermann %!s(int64=6) %!d(string=hai) anos
pai
achega
d17ef183d0
Modificáronse 1 ficheiros con 2 adicións e 6 borrados
  1. 2 6
      services/real-time/app/coffee/Router.coffee

+ 2 - 6
services/real-time/app/coffee/Router.coffee

@@ -55,7 +55,7 @@ module.exports = Router =
 		app.post "/client/:client_id/disconnect", httpAuth, HttpApiController.disconnectClient
 		app.post "/client/:client_id/disconnect", httpAuth, HttpApiController.disconnectClient
 
 
 		session.on 'connection', (error, client, session) ->
 		session.on 'connection', (error, client, session) ->
-			client.ol_context = {}
+			client.ol_context = {} unless client.ol_context
 
 
 			client?.on "error", (err) ->
 			client?.on "error", (err) ->
 				logger.err { clientErr: err }, "socket.io client error"
 				logger.err { clientErr: err }, "socket.io client error"
@@ -113,13 +113,9 @@ module.exports = Router =
 				metrics.inc('socket-io.disconnect')
 				metrics.inc('socket-io.disconnect')
 				metrics.gauge('socket-io.clients', io.sockets.clients()?.length - 1)
 				metrics.gauge('socket-io.clients', io.sockets.clients()?.length - 1)
 
 
-				cleanup = () ->
-					delete client.ol_context
 				WebsocketController.leaveProject io, client, (err) ->
 				WebsocketController.leaveProject io, client, (err) ->
 					if err?
 					if err?
-						Router._handleError cleanup, err, client, "leaveProject"
-					else
-						cleanup()
+						Router._handleError (() ->), err, client, "leaveProject"
 
 
 			# Variadic. The possible arguments:
 			# Variadic. The possible arguments:
 			# doc_id, callback
 			# doc_id, callback