Hopiu/django-ddp
1
0
Fork 0
mirror of https://github.com/jazzband/django-ddp.git synced 2026-05-05 14:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.6.2'

Browse source
This commit is contained in:
Tyson Clugg 2015-05-20 15:07:25 +10:00
commit fd302923fd
4 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.rst
View file

@ -1,6 +1,11 @@
Change Log
==========
0.6.2
-----
* Bugfix issue where DDP connection thread stops sending messages after
changing item that has subscribers for other connections but not self.
0.6.1
-----
* Fix `createUser` method to login new user after creation.

4
dddp/api.py
View file

@ -749,8 +749,10 @@ class DDP(APIMixin):
payload['_sub_ids'] = sorted(sub_ids)
try:
ws = this.ws
payload['_tx_id'] = ws.get_tx_id()
payload['_sender'] = ws.connection.pk
if set(sub_ids).intersection(self._subs):
# message must go to connection that initiated the change
payload['_tx_id'] = ws.get_tx_id()
except AttributeError:
pass
cursor = connections[using].cursor()

43
dddp/websocket.py
View file

@ -128,29 +128,12 @@ class DDPWebSocketApplication(geventwebsocket.WebSocketApplication):
# start by waiting for the very first message
self._tx_next_id = next(self._tx_next_id_gen)
self.request = WSGIRequest(self.ws.environ)
# Apply request middleware (so we get request.user and other attrs)
# pylint: disable=protected-access
if self.base_handler._request_middleware is None:
self.base_handler.load_middleware()
for middleware_method in self.base_handler._request_middleware:
response = middleware_method(self.request)
if response:
raise ValueError(response)
this.ws = self
this.request = self.request
this.send = self.send
this.send_msg = self.send_msg
this.reply = self.reply
this.error = self.error
this.request.session.save()
this.remote_addr = self.remote_addr = \
'{0[REMOTE_ADDR]}:{0[REMOTE_PORT]}'.format(
self.ws.environ,
)
self.subs = {}
self.logger.info('+ %s OPEN %s', self, this.request.user)
self.logger.info('+ %s OPEN', self)
self.send('o')
self.send('a["{\\"server_id\\":\\"0\\"}"]')
@ -239,12 +222,19 @@ class DDPWebSocketApplication(geventwebsocket.WebSocketApplication):
# buffer data until we get pre-requisite data
if tx_id is None:
tx_id = self.get_tx_id()
if self._tx_buffer:
self.logger.debug(
'TX received %d, waiting for %d, have %r.',
tx_id, self._tx_next_id, sorted(self._tx_buffer),
)
self._tx_buffer[tx_id] = data
# de-queue messages from buffer
while self._tx_next_id in self._tx_buffer:
# pull next message from buffer
data = self._tx_buffer.pop(self._tx_next_id)
if self._tx_buffer:
self.logger.debug('TX found %d', self._tx_next_id)
# advance next message ID
self._tx_next_id = next(self._tx_next_id_gen)
# send message
@ -320,6 +310,23 @@ class DDPWebSocketApplication(geventwebsocket.WebSocketApplication):
elif version not in support:
self.error('Client version/support mismatch.')
else:
self.request = WSGIRequest(self.ws.environ)
# Apply request middleware (so we get request.user and other attrs)
# pylint: disable=protected-access
if self.base_handler._request_middleware is None:
self.base_handler.load_middleware()
for middleware_method in self.base_handler._request_middleware:
response = middleware_method(self.request)
if response:
raise ValueError(response)
this.ws = self
this.request = self.request
this.send = self.send
this.send_msg = self.send_msg
this.reply = self.reply
this.error = self.error
this.request.session.save()
from dddp.models import Connection
cur = connection.cursor()
cur.execute('SELECT pg_backend_pid()')

2
setup.py
View file

@ -5,7 +5,7 @@ from setuptools import setup, find_packages
setup(
name='django-ddp',
version='0.6.1',
version='0.6.2',
description=__doc__,
long_description=open('README.rst').read(),
author='Tyson Clugg',