<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12135">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Trap handlers: always log to stdout<br><br>Since the scripts are intended to be used as systemd services, there's<br>no need in separate logging via syslog: systemd will take care of<br>properly collecting and storing script output. Hence we can drop extra<br>options and function parameters.<br><br>Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591<br>Related: SYS#4399<br>---<br>M contrib/systemd/osmo-ctrl2cgi.service<br>M osmopy/trap_helper.py<br>M scripts/ctrl2cgi.py<br>M scripts/soap.py<br>4 files changed, 5 insertions(+), 9 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/35/12135/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/systemd/osmo-ctrl2cgi.service b/contrib/systemd/osmo-ctrl2cgi.service</span><br><span>index 8563c66..f82e1e9 100644</span><br><span>--- a/contrib/systemd/osmo-ctrl2cgi.service</span><br><span>+++ b/contrib/systemd/osmo-ctrl2cgi.service</span><br><span>@@ -4,7 +4,7 @@</span><br><span> [Service]</span><br><span> Type=simple</span><br><span> Restart=always</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/ctrl2cgi.py -d -c /etc/osmocom/ctrl2cgi.ini</span><br><span> RestartSec=2</span><br><span> </span><br><span> [Install]</span><br><span>diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py</span><br><span>index d4a3b75..45dc527 100644</span><br><span>--- a/osmopy/trap_helper.py</span><br><span>+++ b/osmopy/trap_helper.py</span><br><span>@@ -95,7 +95,7 @@</span><br><span> sys.argv.remove(dbg2)</span><br><span> os.execl(path, script, *sys.argv[1:])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def debug_init(name, is_debug, output):</span><br><span style="color: hsl(120, 100%, 40%);">+def debug_init(name, is_debug):</span><br><span> """</span><br><span> Initialize signal handlers and logging</span><br><span> """</span><br><span>@@ -104,9 +104,7 @@</span><br><span> log.setLevel(logging.DEBUG)</span><br><span> else:</span><br><span> log.setLevel(logging.INFO)</span><br><span style="color: hsl(0, 100%, 40%);">- log.addHandler(logging.handlers.SysLogHandler('/dev/log'))</span><br><span style="color: hsl(0, 100%, 40%);">- if output:</span><br><span style="color: hsl(0, 100%, 40%);">- log.addHandler(logging.StreamHandler(sys.stdout))</span><br><span style="color: hsl(120, 100%, 40%);">+ log.addHandler(logging.StreamHandler(sys.stdout))</span><br><span> </span><br><span> reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument()</span><br><span> signal.signal(signal.SIGHUP, reboot)</span><br><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>index 89cbf50..1d90ee0 100755</span><br><span>--- a/scripts/ctrl2cgi.py</span><br><span>+++ b/scripts/ctrl2cgi.py</span><br><span>@@ -137,13 +137,12 @@</span><br><span> p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250")</span><br><span> p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server")</span><br><span> p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below</span><br><span style="color: hsl(0, 100%, 40%);">- p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG")</span><br><span> p.add_argument('-l', '--location', help="Location URL of the CGI server")</span><br><span> p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token")</span><br><span> p.add_argument('-c', '--config-file', help="Path to config file (in INI format). Values from config file override command line options.")</span><br><span> args = p.parse_args(namespace=TrapFactory)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log = debug_init('CTRL2CGI', args.debug, args.output)</span><br><span style="color: hsl(120, 100%, 40%);">+ log = debug_init('CTRL2CGI', args.debug)</span><br><span> </span><br><span> T = TrapFactory(Trap, log)</span><br><span> </span><br><span>diff --git a/scripts/soap.py b/scripts/soap.py</span><br><span>index 267b4d8..0534000 100755</span><br><span>--- a/scripts/soap.py</span><br><span>+++ b/scripts/soap.py</span><br><span>@@ -136,11 +136,10 @@</span><br><span> p.add_argument('-w', '--wsdl', required=True, help="WSDL URL for SOAP")</span><br><span> p.add_argument('-n', '--num', type=int, default=5, help="Max number of concurrent HTTP requests to SOAP server")</span><br><span> p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below</span><br><span style="color: hsl(0, 100%, 40%);">- p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG")</span><br><span> p.add_argument('-l', '--location', help="Override location found in WSDL file (don't use unless you know what you're doing)")</span><br><span> args = p.parse_args()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log = debug_init('CTRL2SOAP', args.debug, args.output)</span><br><span style="color: hsl(120, 100%, 40%);">+ log = debug_init('CTRL2SOAP', args.debug)</span><br><span> </span><br><span> log.info("SOAP proxy %s starting with PID %d ..." % (__version__, os.getpid()))</span><br><span> reactor.connectTCP(args.ctrl, args.port, TrapFactory(args.ctrl, args.port, Trap, defer.DeferredSemaphore(args.num), log, args.wsdl, args.location))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12135">change 12135</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/12135"/><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: Ifcad1877d45d43b3a2e617775a1c9b256e190591 </div>
<div style="display:none"> Gerrit-Change-Number: 12135 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>