log: make 32 the default origin_width.
Change-Id: I1159395251332f3b1af3b3a322e7191559105faa
diff --git a/selftest/log_test.ok b/selftest/log_test.ok
index b2fdd69..b9f1465 100644
--- a/selftest/log_test.ok
+++ b/selftest/log_test.ok
@@ -11,7 +11,7 @@
01:02:03: only time
tst: only category
DBG: only level
-some-name(some='detail'): only origin
+ some-name(some='detail'): only origin
only src [log_test.py:70]
- Testing log.style_change()
no log format
@@ -20,7 +20,7 @@
01:02:03: DBG: add level
01:02:03 tst: DBG: add category
01:02:03 tst: DBG: add src [log_test.py:85]
-01:02:03 tst some-name(some='detail'): DBG: add origin [log_test.py:87]
+01:02:03 tst some-name(some='detail'): DBG: add origin [log_test.py:87]
- Testing origin_width
01:02:03 tst shortname: origin str set to 23 chars [log_test.py:94]
01:02:03 tst very long name(and_some=(3, 'things', 'in a tuple'), some='details'): long origin str [log_test.py:96]
diff --git a/selftest/log_test.py b/selftest/log_test.py
index 2ec8635..54a0fb6 100755
--- a/selftest/log_test.py
+++ b/selftest/log_test.py
@@ -113,7 +113,7 @@
t.dbg("debug message, no category nor name set")
print('- Testing logging of Exceptions, tracing origins')
-log.style(time_fmt=fake_time)
+log.style(time_fmt=fake_time, origin_width=0)
class Thing(log.Origin):
def __init__(self, some_path):
diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py
index 34e76fa..31a342d 100755
--- a/src/osmo-gsm-tester.py
+++ b/src/osmo-gsm-tester.py
@@ -109,7 +109,6 @@
if args.log_level:
log.set_all_levels(log.LEVEL_STRS.get(args.log_level))
- log.style_change(origin_width=32)
if args.trace:
log.style_change(trace=True)
diff --git a/src/osmo_gsm_tester/log.py b/src/osmo_gsm_tester/log.py
index 973fc1a..10108bc 100644
--- a/src/osmo_gsm_tester/log.py
+++ b/src/osmo_gsm_tester/log.py
@@ -83,7 +83,7 @@
self.style()
LogTarget.all_targets.append(self)
- def style(self, time=True, time_fmt=DATEFMT, category=True, level=True, origin=True, origin_width=0, src=True, trace=False):
+ def style(self, time=True, time_fmt=DATEFMT, category=True, level=True, origin=True, origin_width=32, src=True, trace=False):
'''
set all logging format aspects, to defaults if not passed:
time: log timestamps;
@@ -507,7 +507,7 @@
'LogTarget producing deterministic results for regression tests'
def __init__(self, log_write_func=None):
super().__init__(log_write_func)
- self.style(time=False, src=False)
+ self.style(time=False, src=False, origin_width=0)
class FileLogTarget(LogTarget):
'LogTarget to log to a file system path'