Skip to content

Commit 751b6a6

Browse files
committed
Add runfolder name to logger, remove timestamp
1 parent 02b1f5b commit 751b6a6

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

samplesheet_validator/samplesheet_validator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def get_logger(self):
124124
runfolder_name = (self.samplesheet_path.split("/")[-1]).split(
125125
"_SampleSheet.csv"
126126
)[0]
127-
logfile_path = f"{os.path.join(self.logdir, runfolder_name)}_{config.TIMESTAMP}_samplesheet_validator.log"
128-
return SSLogger(logfile_path).get_logger()
127+
logfile_path = f"{os.path.join(self.logdir, runfolder_name)}_samplesheet_validator.log"
128+
return SSLogger(logfile_path, runfolder_name).get_logger()
129129

130130
def ss_checks(self) -> None:
131131
"""

samplesheet_validator/ss_logger.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def set_root_logger():
1313
Set up root logger and add stream handler - we only want to add stream handler once
1414
else it will duplicate log messages to the terminal
1515
"""
16-
logger = logging.getLogger()
16+
logger = logging.getLogger(__name__)
1717
logger.setLevel(logging.DEBUG)
1818
stream_handler = logging.StreamHandler(sys.stdout)
1919
stream_handler.setLevel(logging.DEBUG)
@@ -29,6 +29,7 @@ class SSLogger:
2929
Attributes
3030
timestamp (str): Timestamp from config
3131
logfile_path (str): Name of filepath to provide to _file_handler()
32+
runfolder_name (str): Runfolder name
3233
logging_formatter (logging.Formatter): Specifies the layout of log records in the final output
3334
3435
Methods
@@ -40,22 +41,24 @@ class SSLogger:
4041
Get syslog handler for the logger
4142
"""
4243

43-
def __init__(self, logfile_path: str):
44+
def __init__(self, logfile_path: str, runfolder_name: str):
4445
"""
4546
Constructor for the Logger class
4647
:param logfile_path (str): Path to logfile location
48+
:param runfolder_name (str): Runfolder name
4749
"""
4850
# Timestamp used for naming log files with datetime, format %Y%m%d_%H%M%S
4951
self.timestamp = config.TIMESTAMP
5052
self.logfile_path = logfile_path
53+
self.runfolder_name = runfolder_name
5154
self.logging_formatter = logging.Formatter(config.LOGGING_FORMATTER)
5255

5356
def get_logger(self) -> logging.Logger:
5457
"""
5558
Returns a Python logging object, and give it a name
5659
:return logger (object): Python logging object with custom attributes
5760
"""
58-
logger = logging.getLogger()
61+
logger = logging.getLogger(f"{__name__}.{self.runfolder_name}")
5962
logger.filepath = self.logfile_path
6063
logger.setLevel(logging.DEBUG)
6164
logger.addHandler(self._get_file_handler())

0 commit comments

Comments
 (0)