<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12148">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  daniel: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl2cgi: make http request timeout configurable<br><br>Change-Id: I7839121da831aeab0be7e599049bf79471f845fd<br>Related: SYS#4399<br>---<br>M scripts/ctrl2cgi.py<br>1 file changed, 6 insertions(+), 5 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 e11e6e6..81674d8 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.7" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.0.8" # 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>@@ -61,10 +61,10 @@</span><br><span>     #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res))</span><br><span>     return res</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def make_async_req(ts, dst, par, f_write, f_log):</span><br><span style="color: hsl(0, 100%, 40%);">-    d = post(dst, par)</span><br><span style="color: hsl(120, 100%, 40%);">+def make_async_req(ts, dst, par, f_write, f_log, tout):</span><br><span style="color: hsl(120, 100%, 40%);">+    d = post(dst, par, timeout=tout)</span><br><span>     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(0, 100%, 40%);">-    d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors</span><br><span style="color: hsl(120, 100%, 40%);">+    d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (e, par['bsc_id'], dst, tout))) # handle HTTP errors</span><br><span>     return d</span><br><span> </span><br><span> class Trap(CTRL):</span><br><span>@@ -110,7 +110,7 @@</span><br><span>         t = datetime.datetime.now()</span><br><span>         self.factory.log.debug('Preparing request for BSC %s @ %s...' % (params['bsc_id'], t))</span><br><span>         # Ensure that we run only limited number of requests in parallel:</span><br><span style="color: hsl(0, 100%, 40%);">-        self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log, self.factory.timeout)</span><br><span> </span><br><span>     def handle_notificationrejectionv1(self, net, bsc, bts, trx, data):</span><br><span>         """</span><br><span>@@ -148,6 +148,7 @@</span><br><span> </span><br><span>     T.addr_ctrl = config['main'].get('addr_ctrl', 'localhost')</span><br><span>     T.port_ctrl = config['main'].getint('port_ctrl', 4250)</span><br><span style="color: hsl(120, 100%, 40%);">+    T.timeout = config['main'].getint('timeout', 30)</span><br><span>     T.semaphore = defer.DeferredSemaphore(config['main'].getint('num_max_conn', 5))</span><br><span>     T.location = config['main'].get('location')</span><br><span>     T.secret_key = config['main'].get('secret_key')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12148">change 12148</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/12148"/><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: I7839121da831aeab0be7e599049bf79471f845fd </div>
<div style="display:none"> Gerrit-Change-Number: 12148 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>