From b5a3d6732a04e149c7acba6b277d41c41f55e662 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 1 Dec 2020 00:43:52 +0100 Subject: [PATCH] cfg templates: log level and source basename last, log no category-hex Makes for saner log output in stderr files. Change-Id: I2755beffd18d6779367c04e4aaaed119d66eb3be --- selftest/suite_test/suite_test.ok | 6 ++++++ src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl | 3 ++- src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl | 3 ++- src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl | 3 ++- src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl | 3 +++ src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl | 4 +++- 17 files changed, 51 insertions(+), 4 deletions(-) diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok index 150a4e96..9d0493d8 100644 --- a/selftest/suite_test/suite_test.ok +++ b/selftest/suite_test/suite_test.ok @@ -974,6 +974,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty @@ -1001,6 +1004,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 66fa9e56..dd27da09 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl index d4f73ad9..74197298 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging color 1 logging print extended-timestamp 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging level abis debug logging level oml debug logging level pag debug diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl index b816036c..5bc6cd49 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging color 1 logging print extended-timestamp 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging level abis debug logging level oml debug logging level pag debug diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl index 2533354e..a27f57db 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging color 1 logging print extended-timestamp 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging level abis debug logging level oml debug logging level pag debug diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index b202880a..10a44e27 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging color 1 logging print extended-timestamp 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging level abis debug logging level oml debug logging level pag debug diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl index 2276c866..64985e84 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging color 1 logging print extended-timestamp 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging level abis debug logging level oml debug logging level pag debug diff --git a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl index 782f1e8c..24ab5203 100644 --- a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl @@ -6,6 +6,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level ip info logging level tun info diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl index b5736208..9c9cd4e1 100644 --- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl index 970d53c7..7522fedd 100644 --- a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index bf7fc2be..39cde5f7 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl index f5eb03ef..ef2efd00 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl @@ -3,7 +3,8 @@ log stderr logging print extended-timestamp 1 logging print category 1 logging print category-hex 0 - logging print file basename + logging print level 1 + logging print file basename last logging level set-all info line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index c0e6cd2f..29432046 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -3,7 +3,8 @@ log stderr logging print extended-timestamp 1 logging print category 1 logging print category-hex 0 - logging print file basename + logging print level 1 + logging print file basename last logging level set-all info line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index 74456099..9e442502 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -3,7 +3,8 @@ log stderr logging print extended-timestamp 1 logging print category 1 logging print category-hex 0 - logging print file basename + logging print level 1 + logging print file basename last logging level set-all info line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl index 7d12ab53..729c9174 100644 --- a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl @@ -6,6 +6,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl index c180e824..c081ad7f 100644 --- a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl @@ -3,6 +3,9 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all debug line vty diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 55e285ab..d7996fed 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -5,8 +5,10 @@ log stderr logging filter all 1 logging color 1 logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last logging timestamp 1 - logging print file basename logging print extended-timestamp 1 logging level set-all info logging level ctr notice