| 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 (27 lines) |
| When the condition are met the socket is closed | When the condition are met the socket is closed | ||||
| """ | """ | ||||
| remaining = self.remaining_send_bytes | remaining = self.remaining_send_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 byte limit on this operation. Call original function. | |||||
| if not remaining: | |||||
| result = func(data, *args, **kwargs) | |||||
| obj._writelog(b'%s(%d) -> %s' % (bmethod, len(data), data)) | |||||
| return result | |||||
| if remaining: | |||||
| remaining = max(0, remaining) | remaining = max(0, remaining) | ||||
| if remaining > 0: | if not remaining: | ||||
| newdata = data | |||||
| else: | |||||
| if remaining < len(data): | if remaining < len(data): | ||||
| newdata = data[0:remaining] | newdata = data[0:remaining] | ||||
| else: | else: | ||||
| newdata = data | newdata = data | ||||
| remaining -= len(newdata) | remaining -= len(newdata) | ||||
| self.remaining_send_bytes = remaining | |||||
| result = func(newdata, *args, **kwargs) | |||||
| if remaining is None: | |||||
| obj._writelog(b'%s(%d) -> %s' % (bmethod, len(data), data)) | |||||
| else: | |||||
| obj._writelog( | obj._writelog( | ||||
| b'%s(%d from %d) -> (%d) %s' | b'%s(%d from %d) -> (%d) %s' | ||||
| % ( | % ( | ||||
| bmethod, | bmethod, | ||||
| len(newdata), | len(newdata), | ||||
| len(data), | len(data), | ||||
| remaining, | remaining, | ||||
| newdata, | newdata, | ||||
| ) | ) | ||||
| ) | ) | ||||
| result = func(newdata, *args, **kwargs) | if remaining is not None and remaining <= 0: | ||||
| self.remaining_send_bytes = remaining | |||||
| if remaining <= 0: | |||||
| obj._writelog(b'write limit reached; closing socket') | obj._writelog(b'write limit reached; closing socket') | ||||
| object.__getattribute__(obj, '_cond_close')() | object.__getattribute__(obj, '_cond_close')() | ||||
| raise Exception('connection closed after sending N bytes') | raise Exception('connection closed after sending N bytes') | ||||
| return result | return result | ||||
| def forward_read(self, obj, method, size=-1): | def forward_read(self, obj, method, size=-1): | ||||
| """call an underlying read function until condition are met | """call an underlying read function until condition are met | ||||