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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Trap handlers: log request/reply as info level<br><br>Log the basic location-state trap triggering request and command reply<br>as info level - that way we can receive useful information without<br>turning on full debug output.<br><br>Change-Id: If8eae9f36292930571954becf6613fada43d301c<br>---<br>M osmopy/trap_helper.py<br>M scripts/ctrl2cgi.py<br>M scripts/soap.py<br>3 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py</span><br><span>index b7202ac..3e80c6d 100644</span><br><span>--- a/osmopy/trap_helper.py</span><br><span>+++ b/osmopy/trap_helper.py</span><br><span>@@ -60,7 +60,7 @@</span><br><span>     Command processor: takes function f to run for each command</span><br><span>     """</span><br><span>     bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format</span><br><span style="color: hsl(0, 100%, 40%);">-    log.debug("BSC %s commands: %r" % (bid, comm))</span><br><span style="color: hsl(120, 100%, 40%);">+    log.info("BSC %s commands: %r" % (bid, comm))</span><br><span>     for t in comm:</span><br><span>         (_, m) = Ctrl().cmd(*t.split())</span><br><span>         f(m)</span><br><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>index addca2f..5c675bc 100755</span><br><span>--- a/scripts/ctrl2cgi.py</span><br><span>+++ b/scripts/ctrl2cgi.py</span><br><span>@@ -104,7 +104,7 @@</span><br><span>         Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers</span><br><span>         """</span><br><span>         params = make_params(bsc, data)</span><br><span style="color: hsl(0, 100%, 40%);">-        self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data))</span><br><span style="color: hsl(120, 100%, 40%);">+        self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data))</span><br><span>         params['h'] = gen_hash(params, self.factory.secret_key)</span><br><span>         # Ensure that we run only limited number of requests in parallel:</span><br><span>         self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log)</span><br><span>diff --git a/scripts/soap.py b/scripts/soap.py</span><br><span>index f771530..5817988 100755</span><br><span>--- a/scripts/soap.py</span><br><span>+++ b/scripts/soap.py</span><br><span>@@ -86,7 +86,7 @@</span><br><span>         Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers</span><br><span>         """</span><br><span>         params = make_params(bsc, data)</span><br><span style="color: hsl(0, 100%, 40%);">-        self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data))</span><br><span style="color: hsl(120, 100%, 40%);">+        self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data))</span><br><span>         ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status'])</span><br><span>         d = post(self.factory.location, ctx.envelope)</span><br><span>         d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12146">change 12146</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/12146"/><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: If8eae9f36292930571954becf6613fada43d301c </div>
<div style="display:none"> Gerrit-Change-Number: 12146 </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>