Change in osmocom-bb[master]: trx_toolkit/app_common: introduce auxiliary add_log_handler()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/17759 )

Change subject: trx_toolkit/app_common: introduce auxiliary add_log_handler()
......................................................................

trx_toolkit/app_common: introduce auxiliary add_log_handler()

Change-Id: Ied32764cf1c34dc7e0f746f4f085ea20168775cb
---
M src/target/trx_toolkit/app_common.py
1 file changed, 14 insertions(+), 8 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py
index f2a47c5..8ee5054 100644
--- a/src/target/trx_toolkit/app_common.py
+++ b/src/target/trx_toolkit/app_common.py
@@ -40,19 +40,25 @@
 			"This is free software: you are free to change and redistribute it.\n" \
 			"There is NO WARRANTY, to the extent permitted by law.\n")
 
+	def add_log_handler(self, lh, log_level, log_fmt):
+		lf = log.Formatter(log_fmt)
+		ll = log.getLevelName(log_level)
+
+		log.root.addHandler(lh)
+		lh.setFormatter(lf)
+		lh.setLevel(ll)
+
 	def app_init_logging(self, argv):
 		# Default logging handler (stderr)
-		sh = log.StreamHandler()
-		sh.setLevel(log.getLevelName(argv.log_level))
-		sh.setFormatter(log.Formatter(argv.log_fmt))
-		log.root.addHandler(sh)
+		lo = (argv.log_level, argv.log_fmt)
+		lh = log.StreamHandler()
+		self.add_log_handler(lh, *lo)
 
 		# Optional file handler
 		if argv.log_file_name is not None:
-			fh = log.FileHandler(argv.log_file_name)
-			fh.setLevel(log.getLevelName(argv.log_file_level))
-			fh.setFormatter(log.Formatter(argv.log_file_fmt))
-			log.root.addHandler(fh)
+			lo = (argv.log_file_level, argv.log_file_fmt)
+			lh = log.FileHandler(argv.log_file_name)
+			self.add_log_handler(lh, *lo)
 
 		# Set DEBUG for the root logger
 		log.root.setLevel(log.DEBUG)

-- 
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/17759
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ied32764cf1c34dc7e0f746f4f085ea20168775cb
Gerrit-Change-Number: 17759
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200414/057bb178/attachment.htm>