sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #05790
Re: [Merge] ~ack/maas:websocket-inlinecallbacks into maas:master
Diff comments:
> diff --git a/src/maasserver/websockets/protocol.py b/src/maasserver/websockets/protocol.py
> index 57c5f33..e35777a 100644
> --- a/src/maasserver/websockets/protocol.py
> +++ b/src/maasserver/websockets/protocol.py
> @@ -274,12 +256,10 @@ class WebSocketProtocol(Protocol):
>
> if msg_type == MSG_TYPE.PING:
> self.sequence_number += 1
> - return defer.succeed(
> - self.sendResult(
> - request_id=request_id,
> - result=self.sequence_number,
> - msg_type=MSG_TYPE.PING_REPLY,
> - )
> + self.sendResult(
> + request_id=request_id,
> + result=self.sequence_number,
> + msg_type=MSG_TYPE.PING_REPLY,
you're right, I mistakenly thought this was yielding for the purpose of running something async (that is not really the case in sendResult).
But given that's a return, it needs to stay this way unless we change to inlineCallbacks here too. Reverted
> )
>
> # Decode the method to be called.
--
https://code.launchpad.net/~ack/maas/+git/maas/+merge/438520
Your team MAAS Committers is subscribed to branch maas:master.
References