mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8046 from ThomasWaldmann/logging-msg-param-master 

borg.logger: use same method params as python logging
This commit is contained in:
TW 2024-01-16 03:08:08 +01:00 committed by GitHub
parent 2787da205c ba2e8f2dec
commit c59b8fa079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/borg/logger.py
View File

@ -266,43 +266,43 @@ class LazyLogger:
def getChild(self, suffix): def getChild(self, suffix):
return LazyLogger(self.__name + "." + suffix) return LazyLogger(self.__name + "." + suffix)
def setLevel(self, *args, **kw): def setLevel(self, level):
return self.__logger.setLevel(*args, **kw) return self.__logger.setLevel(level)
def log(self, *args, **kw): def log(self, level, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.log(*args, **kw) return self.__logger.log(level, msg, *args, **kwargs)
def exception(self, *args, **kw): def exception(self, msg, *args, exc_info=True, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.exception(*args, **kw) return self.__logger.exception(msg, *args, exc_info=exc_info, **kwargs)
def debug(self, *args, **kw): def debug(self, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.debug(*args, **kw) return self.__logger.debug(msg, *args, **kwargs)
def info(self, *args, **kw): def info(self, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.info(*args, **kw) return self.__logger.info(msg, *args, **kwargs)
def warning(self, *args, **kw): def warning(self, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.warning(*args, **kw) return self.__logger.warning(msg, *args, **kwargs)
def error(self, *args, **kw): def error(self, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.error(*args, **kw) return self.__logger.error(msg, *args, **kwargs)
def critical(self, *args, **kw): def critical(self, msg, *args, **kwargs):
if "msgid" in kw: if "msgid" in kwargs:
kw.setdefault("extra", {})["msgid"] = kw.pop("msgid") kwargs.setdefault("extra", {})["msgid"] = kwargs.pop("msgid")
return self.__logger.critical(*args, **kw) return self.__logger.critical(msg, *args, **kwargs)
def create_logger(name: str = None) -> LazyLogger: def create_logger(name: str = None) -> LazyLogger: