Revision e9db8806 kamaki/logger.py

b/kamaki/logger.py
56 56
    LOG_FILE = [filename] + LOG_FILE
57 57

  
58 58

  
59
def add_file_logger(
60
        name, caller,
61
        level=logging.DEBUG, prefix='', filename='/tmp/kamaki.log'):
59
def _add_logger(name, level=None, filename=None, fmt=None):
60
    log = logging.getLogger(name)
61
    h = logging.FileHandler(filename) if (
62
        filename) else logging.StreamHandler(filename)
63
    h.setFormatter(logging.Formatter(fmt or '%(name)s %(message)s'))
64
    log.addHandler(h)
65
    log.setLevel(level or logging.DEBUG)
66
    return get_logger(name)
67

  
68

  
69
def add_file_logger(name, level=None, prefix='', filename=None):
70
    try:
71
        return _add_logger(
72
            name, level, filename or get_log_filename(),
73
            fmt='%(name)s(%(levelname)s) %(asctime)s\n\t%(message)s')
74
    except Exception:
75
        return get_logger(name)
76

  
77

  
78
def add_stream_logger(name, level=None):
62 79
    try:
63
        assert caller and filename
64
        logger = logging.getLogger(name)
65
        h = logging.FileHandler(filename)
66
        fmt = logging.Formatter(
67
            '%(asctime)s ' + caller + ' %(name)s-%(levelname)s: %(message)s')
68
        h.setFormatter(fmt)
69
        logger.addHandler(h)
70
        logger.setLevel(level)
80
        return _add_logger(name, level, fmt='%(name)s\n\t%(message)s')
71 81
    except Exception:
72
        pass
82
        return get_logger(name)
73 83

  
74 84

  
75 85
def get_logger(name):

Also available in: Unified diff