<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21503">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cfg templates: log level and source basename last, log no category-hex<br><br>Makes for saner log output in stderr files.<br><br>Change-Id: I2755beffd18d6779367c04e4aaaed119d66eb3be<br>---<br>M selftest/suite_test/suite_test.ok<br>M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl<br>17 files changed, 51 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok</span><br><span>index 150a4e9..9d0493d 100644</span><br><span>--- a/selftest/suite_test/suite_test.ok</span><br><span>+++ b/selftest/suite_test/suite_test.ok</span><br><span>@@ -974,6 +974,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>@@ -1001,6 +1004,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>index 66fa9e5..dd27da0 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>index d4f73ad..7419729 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging color 1</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level abis debug</span><br><span> logging level oml debug</span><br><span> logging level pag debug</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>index b816036..5bc6cd4 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging color 1</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level abis debug</span><br><span> logging level oml debug</span><br><span> logging level pag debug</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>index 2533354..a27f57d 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging color 1</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level abis debug</span><br><span> logging level oml debug</span><br><span> logging level pag debug</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>index b202880..10a44e2 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging color 1</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level abis debug</span><br><span> logging level oml debug</span><br><span> logging level pag debug</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>index 2276c86..64985e8 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging color 1</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level abis debug</span><br><span> logging level oml debug</span><br><span> logging level pag debug</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl</span><br><span>index 782f1e8..24ab520 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl</span><br><span>@@ -6,6 +6,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level ip info</span><br><span> logging level tun info</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl</span><br><span>index b573620..9c9cd4e 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl</span><br><span>index 970d53c..7522fed 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>index bf7fc2b..39cde5f 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>index f5eb03e..ef2efd0 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>@@ -3,7 +3,8 @@</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span> logging print category-hex 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level set-all info</span><br><span> line vty</span><br><span> no login</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>index c0e6cd2..2943204 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl</span><br><span>@@ -3,7 +3,8 @@</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span> logging print category-hex 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level set-all info</span><br><span> line vty</span><br><span> no login</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>index 7445609..9e44250 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl</span><br><span>@@ -3,7 +3,8 @@</span><br><span> logging print extended-timestamp 1</span><br><span> logging print category 1</span><br><span> logging print category-hex 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging level set-all info</span><br><span> line vty</span><br><span> no login</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl</span><br><span>index 7d12ab5..729c917 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl</span><br><span>@@ -6,6 +6,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl</span><br><span>index c180e82..c081ad7 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl</span><br><span>@@ -3,6 +3,9 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all debug</span><br><span> line vty</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>index 55e285a..d7996fe 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>@@ -5,8 +5,10 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span> logging timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename</span><br><span> logging print extended-timestamp 1</span><br><span> logging level set-all info</span><br><span> logging level ctr notice</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21503">change 21503</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/c/osmo-gsm-tester/+/21503"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2755beffd18d6779367c04e4aaaed119d66eb3be </div>
<div style="display:none"> Gerrit-Change-Number: 21503 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>