| Alphare |
| hg-reviewers |
Our ultimate goal is to add another way to define the connection needs to be
closed. To do so, we need the "read" code to be more unified.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/testlib/badserverext.py (42 lines) |
| When the condition are met the socket is closed | When the condition are met the socket is closed | ||||
| """ | """ | ||||
| remaining = self.remaining_recv_bytes | remaining = self.remaining_recv_bytes | ||||
| orig = object.__getattribute__(obj, '_orig') | orig = object.__getattribute__(obj, '_orig') | ||||
| bmethod = method.encode('ascii') | bmethod = method.encode('ascii') | ||||
| func = getattr(orig, method) | func = getattr(orig, method) | ||||
| # No read limit. Call original function. | requested_size = size | ||||
| if not remaining: | actual_size = size | ||||
| result = func(size) | |||||
| obj._writelog( | |||||
| b'%s(%d) -> (%d) %s' % (bmethod, size, len(result), result) | |||||
| ) | |||||
| return result | |||||
| origsize = size | |||||
| if remaining: | |||||
| if size < 0: | if size < 0: | ||||
| size = remaining | actual_size = remaining | ||||
| else: | else: | ||||
| size = min(remaining, size) | actual_size = min(remaining, requested_size) | ||||
| result = func(size) | |||||
| remaining -= len(result) | |||||
| obj._writelog( | result = func(actual_size) | ||||
| b'%s(%d from %d) -> (%d) %s' | |||||
| % (bmethod, size, origsize, len(result), result) | |||||
| ) | |||||
| if remaining: | |||||
| remaining -= len(result) | |||||
| self.remaining_recv_bytes = remaining | self.remaining_recv_bytes = remaining | ||||
| if remaining <= 0: | if requested_size == actual_size: | ||||
| msg = b'%s(%d) -> (%d) %s' | |||||
| msg %= (bmethod, requested_size, len(result), result) | |||||
| else: | |||||
| msg = b'%s(%d from %d) -> (%d) %s' | |||||
| msg %= (bmethod, actual_size, requested_size, len(result), result) | |||||
| obj._writelog(msg) | |||||
| if remaining is not None and remaining <= 0: | |||||
| obj._writelog(b'read limit reached; closing socket') | obj._writelog(b'read limit reached; closing socket') | ||||
| obj._cond_close() | obj._cond_close() | ||||
| # This is the easiest way to abort the current request. | # This is the easiest way to abort the current request. | ||||
| raise Exception('connection closed after receiving N bytes') | raise Exception('connection closed after receiving N bytes') | ||||
| return result | return result | ||||