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
30 changes: 21 additions & 9 deletions src/hydrodiy/io/iutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,27 @@ def add_tab(self, msg, ntab):
tab_space = " " * self.tab_length * ntab
return tab_space + msg

def error(self, msg, ntab=0, *args, **kwargs):
def add_ret(self, nret):
for i in range(nret):
self._logger.info("")

def error(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.add_tab(msg, ntab)
return self._logger.error(msg, *args, **kwargs)

def info(self, msg, ntab=0, *args, **kwargs):
def info(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.add_tab(msg, ntab)
return self._logger.info(msg, *args, **kwargs)

def warning(self, msg, ntab=0, *args, **kwargs):
def warning(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.add_tab(msg, ntab)
return self._logger.warning(msg, *args, **kwargs)

def critical(self, msg, ntab=0, *args, **kwargs):
def critical(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.add_tab(msg, ntab)
return self._logger.critical(msg, *args, **kwargs)

Expand Down Expand Up @@ -236,19 +244,23 @@ def get_message(self, msg, ntab):
return "{{ {0} }} {1}{2}".format(self.context, tab, msg)
return msg

def error(self, msg, ntab=0, *args, **kwargs):
def error(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.get_message(msg, ntab)
return self._logger.error(msg, *args, **kwargs)

def info(self, msg, ntab=0, *args, **kwargs):
def info(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.get_message(msg, ntab)
return self._logger.info(msg, *args, **kwargs)

def warning(self, msg, ntab=0, *args, **kwargs):
def warning(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.get_message(msg, ntab)
return self._logger.warning(msg, *args, **kwargs)

def critical(self, msg, ntab=0, *args, **kwargs):
def critical(self, msg, ntab=0, nret=0, *args, **kwargs):
self.add_ret(nret)
msg = self.get_message(msg, ntab)
return self._logger.critical(msg, *args, **kwargs)

Expand All @@ -261,7 +273,7 @@ def get_logger(name, level="INFO",
no_duplicate_handler=True,
contextual=False,
start_message=True,
date_fmt="%y-%m-%d %H:%M"):
date_fmt="%d %b %H:%M"):
""" Get a logger object that can handle contextual info

Parameters
Expand Down
6 changes: 3 additions & 3 deletions src/hydrodiy/io/tests/test_hyio_iutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ def test_get_logger():
flog=flog2)

mess = ["flog2 A", "flog2 B"]
logger2.warning(mess[0])
logger2.critical(mess[1])
logger2.warning(mess[0], nret=2)
logger2.critical(mess[1], ntab=2)
logger2.completed()

assert flog2.exists()
Expand All @@ -162,7 +162,7 @@ def test_get_logger():
txt = fl.readlines()
expected = ["@@@ Process started @@@",
logger2.separator_charac*logger2.separator_length,
""] +\
"", "", ""] +\
mess +\
["",
logger2.separator_charac*logger2.separator_length,
Expand Down