call clean_channel in cancel

Author: fosterseth

channels/consumer.py

@@ -47,6 +47,10 @@ async def __call__(self, scope, receive, send):
             self.channel_receive = functools.partial(
                 self.channel_layer.receive, self.channel_name
             )
+            if getattr(self.channel_layer, "clean_channel", None) and callable(self.channel_layer.clean_channel):
+                cancel_callback = functools.partial(self.channel_layer.clean_channel, self.channel_name)
+            else:
+                cancel_callback = None
         # Store send function
         if self._sync:
             self.base_send = async_to_sync(send)
@@ -56,7 +60,7 @@ async def __call__(self, scope, receive, send):
         try:
             if self.channel_layer is not None:
                 await await_many_dispatch(
-                    [receive, self.channel_receive], self.dispatch
+                    [receive, self.channel_receive], self.dispatch, cancel_callback=cancel_callback
                 )
             else:
                 await await_many_dispatch([receive], self.dispatch)

channels/utils.py

@@ -29,7 +29,7 @@ def name_that_thing(thing):
     return repr(thing)
 
 
-async def await_many_dispatch(consumer_callables, dispatch):
+async def await_many_dispatch(consumer_callables, dispatch, cancel_callback=None):
     """
     Given a set of consumer callables, awaits on them all and passes results
     from them to the dispatch awaitable as they come in.
@@ -56,4 +56,5 @@ async def await_many_dispatch(consumer_callables, dispatch):
             try:
                 await task
             except asyncio.CancelledError:
-                pass
+                if cancel_callback:
+                    await cancel_callback()