cfg templates: log level and source basename last, log no category-hex
Makes for saner log output in stderr files.
Change-Id: I2755beffd18d6779367c04e4aaaed119d66eb3be
diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok
index 150a4e9..9d0493d 100644
--- a/selftest/suite_test/suite_test.ok
+++ b/selftest/suite_test/suite_test.ok
@@ -974,6 +974,9 @@
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 @@
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 66fa9e5..dd27da0 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 @@
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 d4f73ad..7419729 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 @@
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 b816036..5bc6cd4 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 @@
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 2533354..a27f57d 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 @@
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 b202880..10a44e2 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 @@
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 2276c86..64985e8 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 @@
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 782f1e8..24ab520 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 @@
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 b573620..9c9cd4e 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 @@
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 970d53c..7522fed 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 @@
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 bf7fc2b..39cde5f 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 @@
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 f5eb03e..ef2efd0 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 @@
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 c0e6cd2..2943204 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 @@
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 7445609..9e44250 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 @@
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 7d12ab5..729c917 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 @@
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 c180e82..c081ad7 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 @@
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 55e285a..d7996fe 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 @@
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