Index: dialin/utils/base.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r149731110e78bdf58e6b5872b545a79dfbee1fb1 --- dialin/utils/base.py (.../base.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/utils/base.py (.../base.py) (revision 149731110e78bdf58e6b5872b545a79dfbee1fb1) @@ -74,6 +74,7 @@ print("Failure") return False + def bring_interface_down(interface: str = "can0", delete=False): """ Brings the specified can interface down @@ -142,6 +143,7 @@ return True return False + def setup_can(interface: str = "can0", is_virtual=False, bitrate=250000, restart_ms=100, txqueue=10000): """ Convenience function to setup a can interface @@ -177,12 +179,13 @@ print("Warning: Could not set txtqueue length: {0}".format(cmd_txqueue)) -def create_logger(log_path: str = "/tmp/DialinScript.log", level: str = "ERROR"): +def create_logger(log_path: str = "/tmp/DialinScript.log", level: str = "ERROR", enable_metadata=True): """ Convenience function to create a logger for external Dialin scripts @param log_path: (str) The full path to the output log file. @param level: (str) The logging level (e.g. INFO, WARN, DEBUG, ERROR, CRITICAL) + @param enable_metadata: (bool) if True, include metadata, otherwise, log only the message @return: (logging.Logger) The logger object """ @@ -195,8 +198,11 @@ fh.setLevel(numeric_level) ch = logging.StreamHandler() ch.setLevel(numeric_level) - formatter = logging.Formatter(fmt=_LogManager.LOG_FMT, + if enable_metadata: + formatter = logging.Formatter(fmt=_LogManager.LOG_FMT, datefmt=_LogManager.LOG_DT_FMT) + else: + formatter = logging.Formatter(fmt=_LogManager.LOG_FMT_NO_METADATA) fh.setFormatter(formatter) ch.setFormatter(formatter) @@ -270,6 +276,7 @@ class _LogManager(ABC): LOG_FMT = '%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s' + LOG_FMT_NO_METADATA = '%(message)s' LOG_DT_FMT = '%m-%d-%Y:%H:%M:%S' def __init__(self, log_level=None, log_filepath="Dialin.log"):