Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ coverage.xml
*.py,cover
.hypothesis/
.pytest_cache/
tmp/

# Translations
*.mo
Expand Down
3 changes: 2 additions & 1 deletion src/wxflow/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ def logit(logger: logging.Logger, name: str = None, message: str = None):
def decorate(func):

log_name = name if name else func.__module__
log_msg = message if message else log_name + "." + func.__name__
file_path = func.__code__.co_filename # Get the file path of the function
log_msg = message if message else log_name + "." + func.__name__ + ": " + file_path

@wraps(func)
def wrapper(*args, **kwargs):
Expand Down
33 changes: 32 additions & 1 deletion tests/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_logger_file(tmp_path, logger_init):
f"Expected message '{reference[lev]}' but found '{message}' in log file"


def test_logger_logit(logger_init):
def test_logger_logit_stdout(logger_init):

logger = Logger('test_logit', level=level, colored_log=True)

Expand All @@ -102,3 +102,34 @@ def spam():
spam()

assert True


def test_logger_logit_logfile(tmp_path, logger_init):

logfile = tmp_path / "logit.log"
logger = Logger('test_logit', level=level, colored_log=True, logfile_path=logfile)

@logit(logger)
def add(x, y):
return x + y

@logit(logger)
def usedict(n, j=0, k=1):
return n + j + k

@logit(logger, 'example')
def spam():
print('Spam!')

add(2, 3)
usedict(2, 3)
usedict(2, k=3)
spam()

# Verify that file paths are logged
with open(logfile, 'r') as fh:
log_contents = fh.read()

# Assert that the message contains the test file name full path
assert 'BEGIN: tests.test_logger.add: ' + str(__file__) in log_contents, \
"Expected test file name to be logged"