<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12412">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl2cgi: account wait and http times separately<br><br>Save and propagate separate timestamp for HTTP request duration to<br>distinguish between time spent waiting on connection limit availability<br>from actual http request time.<br><br>Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf<br>Related: SYS#4399<br>---<br>M scripts/ctrl2cgi.py<br>1 file changed, 13 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>index 28a7c3b..3226c1d 100755</span><br><span>--- a/scripts/ctrl2cgi.py</span><br><span>+++ b/scripts/ctrl2cgi.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.8" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.0.9" # bump this on every non-trivial change</span><br><span> </span><br><span> import argparse, os, logging, logging.handlers, datetime</span><br><span> import hashlib</span><br><span>@@ -39,13 +39,22 @@</span><br><span> # we don't support older versions of TwistedIPA module</span><br><span> assert V(twisted_ipa_version) > V('0.4')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def log_duration(log, bid, ts, ts_http):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Log human-readable duration from timestamps</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ base = datetime.datetime.now()</span><br><span style="color: hsl(120, 100%, 40%);">+ delta_t = datetime.timedelta(seconds = (base - ts).total_seconds())</span><br><span style="color: hsl(120, 100%, 40%);">+ delta_h = datetime.timedelta(seconds = (base - ts_http).total_seconds())</span><br><span style="color: hsl(120, 100%, 40%);">+ delta_w = delta_t - delta_h</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('Request for BSC %s took %s total (%s wait, %s http)' % (bid, delta_t, delta_w, delta_h))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def handle_reply(ts, bid, f, log, resp):</span><br><span style="color: hsl(120, 100%, 40%);">+def handle_reply(ts, ts_http, bid, f, log, resp):</span><br><span> """</span><br><span> Reply handler: process raw CGI server response, function f to run for each command</span><br><span> """</span><br><span> decoded = json.loads(resp.decode('utf-8'))</span><br><span style="color: hsl(0, 100%, 40%);">- log.debug('request for BSC %s took %d seconds' % (bid, (datetime.datetime.now() - ts).total_seconds()))</span><br><span style="color: hsl(120, 100%, 40%);">+ log_duration(log, bid, ts, ts_http)</span><br><span> comm_proc(decoded.get('commands'), bid, f, log)</span><br><span> </span><br><span> def gen_hash(params, skey):</span><br><span>@@ -63,7 +72,7 @@</span><br><span> </span><br><span> def make_async_req(ts, dst, par, f_write, f_log, tout):</span><br><span> d = post(dst, par, timeout=tout)</span><br><span style="color: hsl(0, 100%, 40%);">- d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once</span><br><span style="color: hsl(120, 100%, 40%);">+ d.addCallback(collect, partial(handle_reply, ts, datetime.datetime.now(), par['bsc_id'], f_write, f_log))</span><br><span> d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors</span><br><span> return d</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12412">change 12412</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/12412"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf </div>
<div style="display:none"> Gerrit-Change-Number: 12412 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>