osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41000?usp=email )

Change subject: */osmo-*.cfg: make stderr logging consistent ......................................................................

*/osmo-*.cfg: make stderr logging consistent

Use the following options for stderr logging in all config, to make the output consistent and readable (e.g. no hex categories, no long paths to source files at the end of log lines). Use the same order of parameters in all files.

log stderr logging filter all 1 logging color 1 logging timestamp 1 logging print extended-timestamp 1 logging print file basename last logging print category 1 logging print category-hex 0 logging print level 1

Related: OS#6272 Change-Id: I229cce244719b3ce61afb6df33fe0ca20dc22456 --- M 5gc/osmo-uecups-daemon.cfg M bsc-nat/osmo-bsc-nat.cfg M bsc/osmo-bsc-sccplite.cfg M bsc/osmo-bsc-vamos.cfg M bsc/osmo-bsc.cfg M bsc/osmo-stp.cfg M bts/osmo-bsc.cfg M bts/osmo-bts.cfg M cbc/osmo-cbc.cfg M gbproxy/osmo-gbproxy.cfg M gbproxy/osmo-gbproxy.fr.cfg M ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg M hlr/osmo-hlr.cfg M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg M hnbgw/osmo-stp.cfg M hnodeb/osmo-hnodeb.cfg M mgw/osmo-mgw.cfg M msc/osmo-msc.cfg M msc/osmo-stp.cfg M ns/osmo-ns.fr.cfg M ns/osmo-ns.sgsn.sns.cfg M ns/osmo-ns.sns.cfg M ns/osmo-ns.udp.cfg M pcap-client/osmo-pcap-client.cfg M pcu/osmo-pcu-sns.cfg M pcu/osmo-pcu.cfg M pgw/osmo-uecups-daemon.cfg M sgsn/osmo-sgsn.cfg M sgsn/osmo-sgsn.sns.cfg M sgsn/osmo-stp.cfg M sip/osmo-sip-connector.cfg M smlc/osmo-smlc.cfg M smlc/osmo-smlc.latest.cfg M smlc/osmo-stp.cfg M stp/osmo-stp.cfg M upf/osmo-upf.cfg 37 files changed, 171 insertions(+), 96 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/41000/1

diff --git a/5gc/osmo-uecups-daemon.cfg b/5gc/osmo-uecups-daemon.cfg index 5a1eafc..5ceb162 100644 --- a/5gc/osmo-uecups-daemon.cfg +++ b/5gc/osmo-uecups-daemon.cfg @@ -3,13 +3,13 @@ logging filter all 1 log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 logging level set-all info line vty bind 127.0.0.20 diff --git a/bsc-nat/osmo-bsc-nat.cfg b/bsc-nat/osmo-bsc-nat.cfg index f7b51e5..de049d1 100644 --- a/bsc-nat/osmo-bsc-nat.cfg +++ b/bsc-nat/osmo-bsc-nat.cfg @@ -10,6 +10,11 @@ logging filter all 1 logging color 1 logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level rll notice logging level cc notice logging level mm notice diff --git a/bsc/osmo-bsc-sccplite.cfg b/bsc/osmo-bsc-sccplite.cfg index 74923c1..b76e89b 100644 --- a/bsc/osmo-bsc-sccplite.cfg +++ b/bsc/osmo-bsc-sccplite.cfg @@ -7,6 +7,31 @@ logging level set-all debug logging filter all 1 ! +log stderr + logging filter all 1 + logging color 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 +! + logging level set-all notice + logging level rll notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level ho notice + logging level ref notice + logging level ctrl notice + logging level filter debug + logging level pcu debug +! stats interval 0 stats reporter statsd prefix TTCN3 diff --git a/bsc/osmo-bsc-vamos.cfg b/bsc/osmo-bsc-vamos.cfg index bf369f6..53481bd 100644 --- a/bsc/osmo-bsc-vamos.cfg +++ b/bsc/osmo-bsc-vamos.cfg @@ -9,13 +9,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level rll notice diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 6722fea..621d4c9 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -9,13 +9,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level rll notice diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg index 861e75d..0ec559c 100644 --- a/bsc/osmo-stp.cfg +++ b/bsc/osmo-stp.cfg @@ -8,13 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level lss7 debug diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg index 967e265..7d73cc6 100644 --- a/bts/osmo-bsc.cfg +++ b/bts/osmo-bsc.cfg @@ -9,13 +9,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level rll info diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg index e0fadb1..c583d32 100644 --- a/bts/osmo-bts.cfg +++ b/bts/osmo-bts.cfg @@ -8,13 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level rsl info diff --git a/cbc/osmo-cbc.cfg b/cbc/osmo-cbc.cfg index 5e8656d..fc29286 100644 --- a/cbc/osmo-cbc.cfg +++ b/cbc/osmo-cbc.cfg @@ -7,11 +7,12 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 + logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 logging print level 1 - logging print file 1 last logging level set-all info logging level cbsp debug logging level sbcap debug diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index ee888f4..615c0d6 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -8,10 +8,12 @@ log stderr logging filter all 1 logging color 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last logging print category 1 logging print category-hex 0 - logging timestamp 1 - logging print file 1 + logging print level 1 logging level lns debug logging level lnssignal debug logging level lbssgp debug diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index fd5ee8a..5232e42 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -6,6 +6,14 @@ logging level set-all debug logging filter all 1 log stderr + logging filter all 1 + logging color 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level lns debug line vty no login diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg index a01ce5b..5966aaf 100644 --- a/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg @@ -9,11 +9,11 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 logging print level 1 logging level ip info logging level tun info diff --git a/hlr/osmo-hlr.cfg b/hlr/osmo-hlr.cfg index 008b336..74e3c9f 100644 --- a/hlr/osmo-hlr.cfg +++ b/hlr/osmo-hlr.cfg @@ -8,9 +8,12 @@ log stderr logging filter all 1 logging color 1 - logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level all debug logging level linp error ! diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index 85a95e9..7e3383d 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -9,12 +9,12 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 - logging print level 1 - logging print thread-id 0 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug ! line vty diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 1fc69c6..38b1f27 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -9,12 +9,12 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 - logging print level 1 - logging print thread-id 0 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug ! line vty diff --git a/hnbgw/osmo-stp.cfg b/hnbgw/osmo-stp.cfg index dc3b335..fe01f7f 100644 --- a/hnbgw/osmo-stp.cfg +++ b/hnbgw/osmo-stp.cfg @@ -8,9 +8,12 @@ log stderr logging filter all 1 logging color 1 - logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level lglobal notice logging level llapd notice logging level linp notice diff --git a/hnodeb/osmo-hnodeb.cfg b/hnodeb/osmo-hnodeb.cfg index 87c36f5..0f563cd 100644 --- a/hnodeb/osmo-hnodeb.cfg +++ b/hnodeb/osmo-hnodeb.cfg @@ -5,10 +5,12 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 + logging timestamp 1 logging print extended-timestamp 1 - logging print file basename + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug line vty no login diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 8f390df..c2e4a03 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -9,11 +9,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging timestamp 1 - logging print file basename last logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all notice logging level lmgcp debug ! diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 9b52896..22003e7 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -8,13 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level rll notice diff --git a/msc/osmo-stp.cfg b/msc/osmo-stp.cfg index 284e5cd..ad43ba2 100644 --- a/msc/osmo-stp.cfg +++ b/msc/osmo-stp.cfg @@ -8,13 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 ! logging level set-all notice logging level lss7 debug diff --git a/ns/osmo-ns.fr.cfg b/ns/osmo-ns.fr.cfg index 3f941f1..b0d2d11 100644 --- a/ns/osmo-ns.fr.cfg +++ b/ns/osmo-ns.fr.cfg @@ -3,11 +3,13 @@

log stderr logging filter all 1 - logging print level 1 + logging color 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last logging print category 1 logging print category-hex 0 - logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all debug ! stats interval 0 diff --git a/ns/osmo-ns.sgsn.sns.cfg b/ns/osmo-ns.sgsn.sns.cfg index bebc87e..1ee9a72 100644 --- a/ns/osmo-ns.sgsn.sns.cfg +++ b/ns/osmo-ns.sgsn.sns.cfg @@ -4,12 +4,13 @@ ! log stderr logging filter all 1 - logging color 0 - logging print category-hex 0 - logging print category 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 logging print level 1 - logging print file basename logging level force-all info logging level lglobal debug logging level llapd debug diff --git a/ns/osmo-ns.sns.cfg b/ns/osmo-ns.sns.cfg index b342305..5cdb83c 100644 --- a/ns/osmo-ns.sns.cfg +++ b/ns/osmo-ns.sns.cfg @@ -4,12 +4,13 @@ ! log stderr logging filter all 1 - logging color 0 - logging print category-hex 0 - logging print category 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 logging print level 1 - logging print file basename logging level force-all info logging level lglobal debug logging level llapd debug diff --git a/ns/osmo-ns.udp.cfg b/ns/osmo-ns.udp.cfg index b327c32..6bb88ef 100644 --- a/ns/osmo-ns.udp.cfg +++ b/ns/osmo-ns.udp.cfg @@ -4,12 +4,13 @@ ! log stderr logging filter all 1 - logging color 0 - logging print category-hex 0 - logging print category 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 logging print level 1 - logging print file basename logging level force-all info logging level lglobal debug logging level llapd debug diff --git a/pcap-client/osmo-pcap-client.cfg b/pcap-client/osmo-pcap-client.cfg index 33706d8..16295da 100644 --- a/pcap-client/osmo-pcap-client.cfg +++ b/pcap-client/osmo-pcap-client.cfg @@ -2,6 +2,16 @@ ! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty !! ! +log stderr + logging filter all 1 + logging color 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 +! log gsmtap 127.0.0.1 logging level set-all debug logging filter all 1 diff --git a/pcu/osmo-pcu-sns.cfg b/pcu/osmo-pcu-sns.cfg index cfe4ccf..d3c39ce 100644 --- a/pcu/osmo-pcu-sns.cfg +++ b/pcu/osmo-pcu-sns.cfg @@ -5,11 +5,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last logging print category 1 logging print category-hex 0 - logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all debug

line vty diff --git a/pcu/osmo-pcu.cfg b/pcu/osmo-pcu.cfg index 68ea521..5098435 100644 --- a/pcu/osmo-pcu.cfg +++ b/pcu/osmo-pcu.cfg @@ -5,11 +5,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file basename last logging print category 1 logging print category-hex 0 - logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all debug ! stats interval 0 diff --git a/pgw/osmo-uecups-daemon.cfg b/pgw/osmo-uecups-daemon.cfg index 5a1eafc..5ceb162 100644 --- a/pgw/osmo-uecups-daemon.cfg +++ b/pgw/osmo-uecups-daemon.cfg @@ -3,13 +3,13 @@ logging filter all 1 log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging timestamp 1 - logging color 1 logging level set-all info line vty bind 127.0.0.20 diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index e9f56c0..a4c4022 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -8,12 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging color 1 logging level mm debug logging level pag notice logging level meas notice diff --git a/sgsn/osmo-sgsn.sns.cfg b/sgsn/osmo-sgsn.sns.cfg index 327535e..1cfedee 100644 --- a/sgsn/osmo-sgsn.sns.cfg +++ b/sgsn/osmo-sgsn.sns.cfg @@ -8,12 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging color 1 logging level mm debug logging level pag notice logging level meas notice diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg index 7b1e965..93e35db 100644 --- a/sgsn/osmo-stp.cfg +++ b/sgsn/osmo-stp.cfg @@ -8,12 +8,13 @@ ! log stderr logging filter all 1 + logging color 1 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last - logging print category-hex 0 logging print category 1 + logging print category-hex 0 logging print level 1 - logging color 1 logging level lglobal notice logging level llapd notice logging level linp notice diff --git a/sip/osmo-sip-connector.cfg b/sip/osmo-sip-connector.cfg index 50763da..bddcb90 100644 --- a/sip/osmo-sip-connector.cfg +++ b/sip/osmo-sip-connector.cfg @@ -9,10 +9,12 @@ log stderr logging filter all 1 logging color 1 - logging print category 1 logging timestamp 1 logging print extended-timestamp 1 - logging print file basename + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level all debug ! stats interval 5 diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index d034e9d..5bfdaaf 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -4,11 +4,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 - logging print category-hex 0 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug ! stats interval 0 diff --git a/smlc/osmo-smlc.latest.cfg b/smlc/osmo-smlc.latest.cfg index 32b3084..e642549 100644 --- a/smlc/osmo-smlc.latest.cfg +++ b/smlc/osmo-smlc.latest.cfg @@ -4,11 +4,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 - logging print category-hex 0 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug ! line vty diff --git a/smlc/osmo-stp.cfg b/smlc/osmo-stp.cfg index 2dfe1a1..654ddfc 100644 --- a/smlc/osmo-stp.cfg +++ b/smlc/osmo-stp.cfg @@ -9,11 +9,12 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 - logging print category-hex 0 + logging timestamp 1 logging print extended-timestamp 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all notice logging level lss7 debug logging level lsccp debug diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg index 241382d..ee3f91a 100644 --- a/stp/osmo-stp.cfg +++ b/stp/osmo-stp.cfg @@ -7,13 +7,13 @@ logging filter all 1 log stderr logging filter all 1 - logging print file basename last - logging print category-hex 0 - logging print category 1 - logging print level 1 logging color 1 logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug ! stats interval 5 diff --git a/upf/osmo-upf.cfg b/upf/osmo-upf.cfg index 74c1b59..5088e6a 100644 --- a/upf/osmo-upf.cfg +++ b/upf/osmo-upf.cfg @@ -4,12 +4,12 @@ log stderr logging filter all 1 logging color 1 - logging print category-hex 0 - logging print category 1 - logging print thread-id 0 + logging timestamp 1 logging print extended-timestamp 1 - logging print level 1 logging print file basename last + logging print category 1 + logging print category-hex 0 + logging print level 1 logging level set-all debug pfcp local-addr 127.0.0.1