diff options
Diffstat (limited to 'src/target/trx_toolkit/app_common.py')
| -rw-r--r-- | src/target/trx_toolkit/app_common.py | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index f2a47c54..531d8dcf 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit # Common helpers for applications # -# (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com> +# (C) 2018-2020 by Vadim Yanitskiy <axilirator@gmail.com> # # All Rights Reserved # @@ -17,10 +16,6 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log @@ -29,6 +24,9 @@ class ApplicationBase: # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s" + # Default time / date format (e.g. 2003-01-23 00:29:50) + LOG_TIME_FMT_DEFAULT = "%Y-%m-%d %H:%M:%S" + def app_print_copyright(self, holders = []): # Print copyright holders if any for date, author in holders: @@ -40,19 +38,27 @@ class ApplicationBase: "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, time_fmt, log_time = False): + log_fmt = "%(asctime)s " + log_fmt if log_time else log_fmt + lf = log.Formatter(log_fmt, time_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, argv.log_time_fmt, argv.log_time) + 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, + argv.log_file_time_fmt, argv.log_file_time) + lh = log.FileHandler(argv.log_file_name) + self.add_log_handler(lh, *lo) # Set DEBUG for the root logger log.root.setLevel(log.DEBUG) @@ -62,6 +68,13 @@ class ApplicationBase: dest = "log_level", type = str, default = "DEBUG", choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], help = "Set logging level (default %(default)s)") + parser.add_argument("--log-time", + dest = "log_time", action = "store_true", + help = "Prefix each log message with the current time") + parser.add_argument("--log-time-format", metavar = "FMT", + dest = "log_time_fmt", type = str, + default = self.LOG_TIME_FMT_DEFAULT, + help = "Set time format (default %(default)s)") parser.add_argument("--log-format", metavar = "FMT", dest = "log_fmt", type = str, default = self.LOG_FMT_DEFAULT, help = "Set logging message format") @@ -73,6 +86,13 @@ class ApplicationBase: dest = "log_file_level", type = str, default = "DEBUG", choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], help = "Set logging level for file (default %(default)s)") + parser.add_argument("--log-file-time", + dest = "log_file_time", action = "store_true", + help = "Prefix each log message with the current time") + parser.add_argument("--log-file-time-format", metavar = "FMT", + dest = "log_file_time_fmt", type = str, + default = self.LOG_TIME_FMT_DEFAULT, + help = "Set time format for file (default %(default)s)") parser.add_argument("--log-file-format", metavar = "FMT", dest = "log_file_fmt", type = str, default = self.LOG_FMT_DEFAULT, help = "Set logging message format for file") |