Skip to content

Commit

Permalink
Merge pull request #158 from vreuter/mgrlog
Browse files Browse the repository at this point in the history
Logging on manager
  • Loading branch information
vreuter committed Jul 2, 2019
2 parents 1c3ba86 + a9d6017 commit 6da4292
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
35 changes: 29 additions & 6 deletions pypiper/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"""

import atexit
from collections import Iterable
import datetime
import errno
import glob
Expand All @@ -22,13 +23,9 @@
import time
import pandas as _pd

if sys.version_info < (3, 3):
from collections import Iterable
else:
from collections.abc import Iterable

from attmap import AttMapEcho
from hashlib import md5
from logmuse import init_logger
from yacman import load_yaml
from .exceptions import PipelineHalt, SubprocessError
from .flags import *
Expand Down Expand Up @@ -107,7 +104,7 @@ def __init__(
self, name, outfolder, version=None, args=None, multi=False,
dirty=False, recover=False, new_start=False, force_follow=False,
cores=1, mem="1000M", config_file=None, output_parent=None,
overwrite_checkpoints=False, **kwargs):
overwrite_checkpoints=False, logger_kwargs=None, **kwargs):

# Params defines the set of options that could be updated via
# command line args to a pipeline run, that can be forwarded
Expand Down Expand Up @@ -323,6 +320,14 @@ def __init__(
print("No config file")
self.config = None

logger_kwargs = logger_kwargs or {}
try:
name = logger_kwargs.pop("name")
except KeyError:
pass
else:
name = ".".join([__name__, self.__class__.__name__, self.name])
self._logger = init_logger(name, **logger_kwargs)

@property
def _completed(self):
Expand Down Expand Up @@ -1099,6 +1104,24 @@ def _wait_for_lock(self, lock_file):
# Logging functions
###################################

def debug(self, msg, *args, **kwargs):
self._logger.debug(msg, *args, **kwargs)

def info(self, msg, *args, **kwargs):
self._logger.info(msg, *args, **kwargs)

def warning(self, msg, *args, **kwargs):
self._logger.warning(msg, *args, **kwargs)

def error(self, msg, *args, **kwargs):
self._logger.error(msg, *args, **kwargs)

def critical(self, msg, *args, **kwargs):
self._logger.critical(msg, *args, **kwargs)

def fatal(self, msg, *args, **kwargs):
self._logger.fatal(msg, *args, **kwargs)

def timestamp(self, message="", checkpoint=None,
finished=False, raise_error=True):
"""
Expand Down
1 change: 1 addition & 0 deletions requirements/reqs-pypiper.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
attmap>=0.12.5
logmuse>=0.2.0
psutil
pandas
ubiquerg>=0.4.5
Expand Down

0 comments on commit 6da4292

Please sign in to comment.