Merge pull request #37 from Ars2014/dev-1.x

Repair RethinkDBStorage
This commit is contained in:
Alex Root Junior 2018-05-19 19:48:32 +03:00 committed by GitHub
commit 84145caf03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -103,17 +103,15 @@ class RethinkDBStorage(BaseStorage):
async def wait_closed(self):
"""
Checks if connection is closed.
Does nothing
"""
if len(self._outstanding_connections) != 0 and self._queue.qsize() != 0:
raise ConnectionNotClosed
return True
await asyncio.sleep(0)
async def get_state(self, *, chat: typing.Union[str, int, None] = None, user: typing.Union[str, int, None] = None,
default: typing.Optional[str] = None) -> typing.Optional[str]:
chat, user = map(str, self.check_address(chat=chat, user=user))
conn = await self.get_connection()
result = await r.table(self._table).get(chat)[user]['state'].default(default or '').run(conn)
result = await r.table(self._table).get(chat)[user]['state'].default(default or None).run(conn)
await self.put_connection(conn)
return result or None