<p>daniel <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_trap2cgi.py: Don't recurse in ctrl_client()<br><br>Use a loop instead. Without it the script will eventually crash with a<br>RecursionError.<br><br> File "/usr/bin/osmo_trap2cgi.py", line 211, in conn_client<br> await ctrl_client(proxy, reader, writer)<br> File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client<br> proxy.dispatch(wr, data)<br>[...]<br> File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client<br> proxy.dispatch(wr, data)<br> File "/usr/bin/osmo_trap2cgi.py", line 201, in ctrl_client<br>[...]<br>RecursionError: maximum recursion depth exceeded in comparison<br><br>Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c<br>Related: SYS#4399<br>---<br>M scripts/osmo_trap2cgi.py<br>1 file changed, 18 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmo_trap2cgi.py b/scripts/osmo_trap2cgi.py</span><br><span>index ad66e7b..ca73fa8 100755</span><br><span>--- a/scripts/osmo_trap2cgi.py</span><br><span>+++ b/scripts/osmo_trap2cgi.py</span><br><span>@@ -22,7 +22,7 @@</span><br><span> */</span><br><span> """</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-__version__ = "0.0.1" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.0.2" # bump this on every non-trivial change</span><br><span> </span><br><span> from functools import partial</span><br><span> import configparser, argparse, time, os, asyncio, aiohttp</span><br><span>@@ -190,29 +190,32 @@</span><br><span> return await reader.readexactly(num_bytes)</span><br><span> except asyncio.IncompleteReadError:</span><br><span> proxy.log.info('Failed to read %d bytes reconnecting to %s:%d...', num_bytes, proxy.ctrl_addr, proxy.ctrl_port)</span><br><span style="color: hsl(0, 100%, 40%);">- await conn_client(proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+ raise</span><br><span> </span><br><span> async def ctrl_client(proxy, rd, wr):</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- Recursively read CTRL stream and handle selected messages.</span><br><span style="color: hsl(120, 100%, 40%);">+ Read CTRL stream and handle selected messages.</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- header = await recon_reader(proxy, rd, 4)</span><br><span style="color: hsl(0, 100%, 40%);">- data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header))</span><br><span style="color: hsl(0, 100%, 40%);">- proxy.dispatch(wr, data)</span><br><span style="color: hsl(0, 100%, 40%);">- await ctrl_client(proxy, rd, wr)</span><br><span style="color: hsl(120, 100%, 40%);">+ while True:</span><br><span style="color: hsl(120, 100%, 40%);">+ header = await recon_reader(proxy, rd, 4)</span><br><span style="color: hsl(120, 100%, 40%);">+ data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header))</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.dispatch(wr, data)</span><br><span> </span><br><span> async def conn_client(proxy):</span><br><span> """</span><br><span> (Re)establish connection with CTRL server and pass Reader/Writer to CTRL handler.</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- reader, writer = await asyncio.open_connection(proxy.ctrl_addr, proxy.ctrl_port)</span><br><span style="color: hsl(0, 100%, 40%);">- proxy.log.info('Connected to %s:%d', proxy.ctrl_addr, proxy.ctrl_port)</span><br><span style="color: hsl(0, 100%, 40%);">- await ctrl_client(proxy, reader, writer)</span><br><span style="color: hsl(0, 100%, 40%);">- except OSError as e:</span><br><span style="color: hsl(0, 100%, 40%);">- proxy.log.info('%s: %d seconds delayed retrying...', e, proxy.timeout)</span><br><span style="color: hsl(0, 100%, 40%);">- await asyncio.sleep(proxy.timeout)</span><br><span style="color: hsl(0, 100%, 40%);">- await conn_client(proxy)</span><br><span style="color: hsl(120, 100%, 40%);">+ while True:</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ reader, writer = await asyncio.open_connection(proxy.ctrl_addr, proxy.ctrl_port)</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.log.info('Connected to %s:%d', proxy.ctrl_addr, proxy.ctrl_port)</span><br><span style="color: hsl(120, 100%, 40%);">+ await ctrl_client(proxy, reader, writer)</span><br><span style="color: hsl(120, 100%, 40%);">+ except OSError as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.log.info('%s: %d seconds delayed retrying...', e, proxy.timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+ await asyncio.sleep(proxy.timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+ except asyncio.IncompleteReadError:</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+ proxy.log.info('Reconnecting...')</span><br><span> </span><br><span> </span><br><span> if __name__ == '__main__':</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545">change 14545</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: python/osmo-python-tests </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c </div>
<div style="display:none"> Gerrit-Change-Number: 14545 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: msuraev <suraev@alumni.ntnu.no> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>