Merge branch 'client-execute-fixed' into 'master'

Client method execute fixed See merge request sd/pseven/DjangoChannelsGraphqlWs!12
datadvance · Jul 27, 2020 · bab91bd · bab91bd
2 parents e25c376 + bff63f9
commit bab91bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Changelog
 
+## [0.7.4] - 2020-07-27
+
+- Client method 'execute' consumes 'complete' message in case of error.
+
 ## [0.7.3] - 2020-07-26
 
 - Logging slightly improved. Thanks to @edouardtheron.

diff --git a/channels_graphql_ws/client.py b/channels_graphql_ws/client.py
@@ -163,9 +163,11 @@ async def execute(self, query, variables=None):
 
         """
         msg_id = await self.start(query, variables=variables)
-        resp = await self.receive(wait_id=msg_id)
-        # Consume 'complete' message.
-        await self.receive(wait_id=msg_id)
+        try:
+            resp = await self.receive(wait_id=msg_id)
+        finally:
+            # Consume 'complete' message.
+            await self.receive(wait_id=msg_id)
         return resp
 
     async def subscribe(self, query, *, variables=None, wait_confirmation=True):

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ build-backend = "poetry.masonry.api"
 # Docs: https://python-poetry.org/docs/
 [tool.poetry]
 name = "django-channels-graphql-ws"
-version = "0.7.3"
+version = "0.7.4"
 description = """Django Channels based WebSocket GraphQL server with \
                  Graphene-like subscriptions"""
 authors = ["Alexander A. Prokhorov <[email protected]>"]