<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9963">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce script ctrl2cgi.py<br><br>This scripts implements a similar proxy to the one already available in<br>soapy.py, but aiming at converting CTRl into a regular HTTP POST Request<br>to be handled by a CGI script in the HTTP server.<br><br>Furthermore, it includes several improvements over the soapy.py script,<br>such as using a token to authenticate users and capability to read some<br>parameters from a cfg file.<br><br>Change-Id: I7a83ecb379835e295c8cb4c27c39883783746544<br>---<br>M README<br>A scripts/ctrl2cgi.py<br>M setup.py<br>3 files changed, 249 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/63/9963/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/README b/README</span><br><span>index 2c04047..37cd847 100644</span><br><span>--- a/README</span><br><span>+++ b/README</span><br><span>@@ -9,6 +9,7 @@</span><br><span> There are currently following scripts in this package:</span><br><span> osmotestconfig.py - test that apps start/write with example configs</span><br><span> soap.py - implementation of SOAP <-> Ctrl proxy implemented on top of Twisted</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl2cgi.py - implementation of CGI <-> Ctrl proxy implemented on top of Twisted</span><br><span> osmo_rate_ctr2csv.py - rate counter dumper on top of osmo_ipa</span><br><span> osmo_interact_vty.py - pipe stdin/stdout to a VTY session</span><br><span> osmo_interact_ctrl.py - pipe stdin/stdout to a CTRL port</span><br><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>new file mode 100755</span><br><span>index 0000000..20293af</span><br><span>--- /dev/null</span><br><span>+++ b/scripts/ctrl2cgi.py</span><br><span>@@ -0,0 +1,247 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/python3</span><br><span style="color: hsl(120, 100%, 40%);">+# -*- mode: python-mode; py-indent-tabs-mode: nil -*-</span><br><span style="color: hsl(120, 100%, 40%);">+"""</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016 sysmocom s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(120, 100%, 40%);">+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+"""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.0.1" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from twisted.internet import defer, reactor</span><br><span style="color: hsl(120, 100%, 40%);">+from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version</span><br><span style="color: hsl(120, 100%, 40%);">+from osmopy.osmo_ipa import Ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+from treq import post, collect</span><br><span style="color: hsl(120, 100%, 40%);">+from functools import partial</span><br><span style="color: hsl(120, 100%, 40%);">+from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available</span><br><span style="color: hsl(120, 100%, 40%);">+import argparse, datetime, signal, sys, os, logging, logging.handlers</span><br><span style="color: hsl(120, 100%, 40%);">+import hashlib</span><br><span style="color: hsl(120, 100%, 40%);">+import json</span><br><span style="color: hsl(120, 100%, 40%);">+import configparser</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# we don't support older versions of TwistedIPA module</span><br><span style="color: hsl(120, 100%, 40%);">+assert V(twisted_ipa_version) > V('0.4')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values CGI-specific</span><br><span style="color: hsl(120, 100%, 40%);">+oper = { 'inoperational' : 0, 'operational' : 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+admin = { 'locked' : 0, 'unlocked' : 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # CGI server treats it as boolean but expects int</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def patch_cgi_resp(r):</span><br><span style="color: hsl(120, 100%, 40%);">+ str = r.decode('utf-8')</span><br><span style="color: hsl(120, 100%, 40%);">+ lines = str.splitlines()</span><br><span style="color: hsl(120, 100%, 40%);">+ i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ #search for empty line, marks start of body</span><br><span style="color: hsl(120, 100%, 40%);">+ for l in lines:</span><br><span style="color: hsl(120, 100%, 40%);">+ i += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ if l == '':</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ print('i="%r"' % i)</span><br><span style="color: hsl(120, 100%, 40%);">+ json_lines = lines[i:]</span><br><span style="color: hsl(120, 100%, 40%);">+ json_str = '\n'.join(json_lines)</span><br><span style="color: hsl(120, 100%, 40%);">+ return json.loads(json_str)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+@defer.inlineCallbacks</span><br><span style="color: hsl(120, 100%, 40%);">+def handle_reply(f, log, resp):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Reply handler: process raw CGI server response, function f to run for each command</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ #log.debug('HANDLE_REPLY: code=%r' % (resp.code))</span><br><span style="color: hsl(120, 100%, 40%);">+ #for key,val in resp.headers.getAllRawHeaders():</span><br><span style="color: hsl(120, 100%, 40%);">+ # log.debug('HANDLE_REPLY: key=%r val=%r' % (key, val))</span><br><span style="color: hsl(120, 100%, 40%);">+ if resp.code != 200:</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_body = yield resp.text()</span><br><span style="color: hsl(120, 100%, 40%);">+ log.critical('Received HTTP response %d: %s' % (resp.code, resp_body))</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ parsed = yield resp.json()</span><br><span style="color: hsl(120, 100%, 40%);">+ #log.debug("RESPONSE: %r" % (parsed))</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_id = parsed.get('commands')[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(120, 100%, 40%);">+ log.info("Received CGI response for BSC %s with %d commands, error status: %s" % (bsc_id, len(parsed.get('commands')), parsed.get('error')))</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("BSC %s commands: %r" % (bsc_id, parsed.get('commands')))</span><br><span style="color: hsl(120, 100%, 40%);">+ for t in parsed.get('commands'): # Process commands format</span><br><span style="color: hsl(120, 100%, 40%);">+ (_, m) = Ctrl().cmd(*t.split())</span><br><span style="color: hsl(120, 100%, 40%);">+ f(m)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def gen_hash(params, skey):</span><br><span style="color: hsl(120, 100%, 40%);">+ input = ''</span><br><span style="color: hsl(120, 100%, 40%);">+ for key in ['time_stamp','position_validity','admin_status','policy_status']:</span><br><span style="color: hsl(120, 100%, 40%);">+ input += str(params.get(key))</span><br><span style="color: hsl(120, 100%, 40%);">+ input += skey</span><br><span style="color: hsl(120, 100%, 40%);">+ for key in ['bsc_id','lat','lon','position_validity']:</span><br><span style="color: hsl(120, 100%, 40%);">+ input += str(params.get(key))</span><br><span style="color: hsl(120, 100%, 40%);">+ m = hashlib.md5()</span><br><span style="color: hsl(120, 100%, 40%);">+ m.update(input.encode('utf-8'))</span><br><span style="color: hsl(120, 100%, 40%);">+ res = m.hexdigest()</span><br><span style="color: hsl(120, 100%, 40%);">+ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res))</span><br><span style="color: hsl(120, 100%, 40%);">+ return res</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class Trap(CTRL):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ TRAP handler (agnostic to factory's client object)</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ def ctrl_TRAP(self, data, op_id, v):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Parse CTRL TRAP and dispatch to appropriate handler after normalization</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ (l, r) = v.split()</span><br><span style="color: hsl(120, 100%, 40%);">+ loc = l.split('.')</span><br><span style="color: hsl(120, 100%, 40%);">+ t_type = loc[-1]</span><br><span style="color: hsl(120, 100%, 40%);">+ p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper</span><br><span style="color: hsl(120, 100%, 40%);">+ method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def ctrl_SET_REPLY(self, data, _, v):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Debug log for replies to our commands</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.log.debug('SET REPLY %s' % v)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def ctrl_ERROR(self, data, op_id, v):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ We want to know if smth went wrong</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def connectionMade(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Logging wrapper, calling super() is necessary not to break reconnection logic</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port))</span><br><span style="color: hsl(120, 100%, 40%);">+ super(CTRL, self).connectionMade()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @defer.inlineCallbacks</span><br><span style="color: hsl(120, 100%, 40%);">+ def handle_locationstate(self, net, bsc, bts, trx, data):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',')</span><br><span style="color: hsl(120, 100%, 40%);">+ tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data))</span><br><span style="color: hsl(120, 100%, 40%);">+ params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix.get(fx, 0), 'time_stamp': tstamp, 'oper_status': oper.get(opr, 2), 'admin_status': admin.get(adm, 2), 'policy_status': policy.get(pol, 3) }</span><br><span style="color: hsl(120, 100%, 40%);">+ params['h'] = gen_hash(params, self.factory.secret_key)</span><br><span style="color: hsl(120, 100%, 40%);">+ d = post(self.factory.location, None, params=params)</span><br><span style="color: hsl(120, 100%, 40%);">+ d.addCallback(partial(handle_reply, 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 style="color: hsl(120, 100%, 40%);">+ d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s" % (e, bsc)), bsc) # handle HTTP errors</span><br><span style="color: hsl(120, 100%, 40%);">+ # Ensure that we run only limited number of requests in parallel:</span><br><span style="color: hsl(120, 100%, 40%);">+ yield self.factory.semaphore.acquire()</span><br><span style="color: hsl(120, 100%, 40%);">+ yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.semaphore.release()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def handle_notificationrejectionv1(self, net, bsc, bts, trx, data):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ self.factory.log.debug('notification-rejection-v1@bsc-id %s => %s' % (bsc, data))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class TrapFactory(IPAFactory):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Store CGI information so TRAP handler can use it for requests</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ location = None</span><br><span style="color: hsl(120, 100%, 40%);">+ log = None</span><br><span style="color: hsl(120, 100%, 40%);">+ semaphore = None</span><br><span style="color: hsl(120, 100%, 40%);">+ client = None</span><br><span style="color: hsl(120, 100%, 40%);">+ host = None</span><br><span style="color: hsl(120, 100%, 40%);">+ port = None</span><br><span style="color: hsl(120, 100%, 40%);">+ secret_key = None</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, host, port, proto, semaphore, log, location, secret_key):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.host = host # for logging only,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.port = port # seems to be no way to get it from ReconnectingClientFactory</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log = log</span><br><span style="color: hsl(120, 100%, 40%);">+ self.semaphore = semaphore</span><br><span style="color: hsl(120, 100%, 40%);">+ self.location = location</span><br><span style="color: hsl(120, 100%, 40%);">+ self.secret_key = secret_key</span><br><span style="color: hsl(120, 100%, 40%);">+ level = self.log.getEffectiveLevel()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log.setLevel(logging.WARNING) # we do not need excessive debug from lower levels</span><br><span style="color: hsl(120, 100%, 40%);">+ super(TrapFactory, self).__init__(proto, self.log)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log.setLevel(level)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def reloader(path, script, log, dbg1, dbg2, signum, _):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("Received Signal %d - restarting..." % signum)</span><br><span style="color: hsl(120, 100%, 40%);">+ if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv:</span><br><span style="color: hsl(120, 100%, 40%);">+ sys.argv.append(dbg1) # enforce debug</span><br><span style="color: hsl(120, 100%, 40%);">+ if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug</span><br><span style="color: hsl(120, 100%, 40%);">+ if dbg1 in sys.argv:</span><br><span style="color: hsl(120, 100%, 40%);">+ sys.argv.remove(dbg1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if dbg2 in sys.argv:</span><br><span style="color: hsl(120, 100%, 40%);">+ sys.argv.remove(dbg2)</span><br><span style="color: hsl(120, 100%, 40%);">+ os.execl(path, script, *sys.argv[1:])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if __name__ == '__main__':</span><br><span style="color: hsl(120, 100%, 40%);">+ p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.')</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-v', '--version', action='version', version=("%(prog)s v" + __version__))</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-a', '--addr-ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-d', '--debug', action='store_true', help="Enable debug log")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-l', '--location', help="Location URL of the CGI server")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token")</span><br><span style="color: hsl(120, 100%, 40%);">+ p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file")</span><br><span style="color: hsl(120, 100%, 40%);">+ args = p.parse_args()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log = logging.getLogger('CTRL2CGI')</span><br><span style="color: hsl(120, 100%, 40%);">+ if args.debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.setLevel(logging.DEBUG)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.setLevel(logging.INFO)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.addHandler(logging.handlers.SysLogHandler('/dev/log'))</span><br><span style="color: hsl(120, 100%, 40%);">+ if args.output:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.addHandler(logging.StreamHandler(sys.stdout))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with add_argument() call above</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.signal(signal.SIGHUP, reboot)</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.signal(signal.SIGQUIT, reboot)</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ location_cfgfile = None</span><br><span style="color: hsl(120, 100%, 40%);">+ secret_key_cfgfile = None</span><br><span style="color: hsl(120, 100%, 40%);">+ port_ctrl_cfgfile = None</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_ctrl_cfgfile = None</span><br><span style="color: hsl(120, 100%, 40%);">+ num_max_conn_cfgfile = None</span><br><span style="color: hsl(120, 100%, 40%);">+ if args.config_file:</span><br><span style="color: hsl(120, 100%, 40%);">+ config = configparser.ConfigParser()</span><br><span style="color: hsl(120, 100%, 40%);">+ config.read(args.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'main' in config:</span><br><span style="color: hsl(120, 100%, 40%);">+ location_cfgfile = config['main'].get('location', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ secret_key_cfgfile = config['main'].get('secret_key', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_ctrl_cfgfile = config['main'].get('addr_ctrl', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ port_ctrl_cfgfile = config['main'].get('port_ctrl', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ num_max_conn_cfgfile = config['main'].get('num_max_conn', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ location = args.location if args.location is not None else location_cfgfile</span><br><span style="color: hsl(120, 100%, 40%);">+ secret_key = args.secret_key if args.secret_key is not None else secret_key_cfgfile</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_ctrl = args.addr_ctrl if args.addr_ctrl is not None else addr_ctrl_cfgfile</span><br><span style="color: hsl(120, 100%, 40%);">+ port_ctrl = args.port_ctrl if args.port_ctrl is not None else port_ctrl_cfgfile</span><br><span style="color: hsl(120, 100%, 40%);">+ num_max_conn = args.num_max_conn if args.num_max_conn is not None else num_max_conn_cfgfile</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("CGI proxy %s starting with PID %d ..." % (__version__, os.getpid()))</span><br><span style="color: hsl(120, 100%, 40%);">+ reactor.connectTCP(addr_ctrl, port_ctrl, TrapFactory(addr_ctrl, port_ctrl, Trap, defer.DeferredSemaphore(num_max_conn), log, location, secret_key))</span><br><span style="color: hsl(120, 100%, 40%);">+ reactor.run()</span><br><span>diff --git a/setup.py b/setup.py</span><br><span>index 1d785e7..061e5df 100755</span><br><span>--- a/setup.py</span><br><span>+++ b/setup.py</span><br><span>@@ -30,6 +30,7 @@</span><br><span> "scripts/osmo_ctrl.py",</span><br><span> "scripts/osmo_rate_ctr2csv.py",</span><br><span> "scripts/soap.py",</span><br><span style="color: hsl(120, 100%, 40%);">+ "scripts/ctrl2cgi.py",</span><br><span> "scripts/osmo_interact_vty.py",</span><br><span> "scripts/osmo_interact_ctrl.py",</span><br><span> "scripts/osmo_verify_transcript_vty.py",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9963">change 9963</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/9963"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7a83ecb379835e295c8cb4c27c39883783746544 </div>
<div style="display:none"> Gerrit-Change-Number: 9963 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>