Revision 9986e569 kamaki/cli/__init__.py

b/kamaki/cli/__init__.py
40 40
from kamaki.cli.history import History
41 41
from kamaki.cli.utils import print_dict, red, magenta, yellow
42 42
from kamaki.cli.errors import CLIError
43
from kamaki.logger import add_stream_logger, get_logger
43 44

  
44 45
_help = False
45 46
_debug = False
......
168 169
def _setup_logging(silent=False, debug=False, verbose=False, include=False):
169 170
    """handle logging for clients package"""
170 171

  
171
    def add_handler(name, level, prefix=''):
172
        h = logging.StreamHandler()
173
        fmt = logging.Formatter(prefix + '%(message)s')
174
        h.setFormatter(fmt)
175
        logger = logging.getLogger(name)
176
        logger.addHandler(h)
177
        logger.setLevel(level)
178

  
179 172
    if silent:
180
        add_handler('', logging.CRITICAL)
173
        add_stream_logger(__name__, logging.CRITICAL)
181 174
        return
182 175

  
183 176
    if debug:
184
        add_handler('requests', logging.INFO, prefix='* ')
185
        add_handler('clients.send', logging.DEBUG, prefix='> ')
186
        add_handler('clients.recv', logging.DEBUG, prefix='< ')
187
        add_handler('kamaki', logging.DEBUG, prefix='(debug): ')
177
        add_stream_logger('kamaki.clients.send', logging.DEBUG)
178
        add_stream_logger('kamaki.clients.recv', logging.DEBUG)
179
        add_stream_logger(__name__, logging.DEBUG)
188 180
    elif verbose:
189
        add_handler('requests', logging.INFO, prefix='* ')
190
        add_handler('clients.send', logging.INFO, prefix='> ')
191
        add_handler('clients.recv', logging.INFO, prefix='< ')
192
        add_handler('kamaki', logging.INFO, prefix='(i): ')
181
        add_stream_logger('kamaki.clients.send', logging.INFO)
182
        add_stream_logger('kamaki.clients.recv', logging.INFO)
183
        add_stream_logger(__name__, logging.INFO)
193 184
    if include:
194
        add_handler('data.send', logging.INFO, prefix='>[data]: ')
195
        add_handler('data.recv', logging.INFO, prefix='<[data]: ')
196
    add_handler('kamaki', logging.WARNING, prefix='(warning): ')
185
        add_stream_logger('kamaki.clients.send', logging.INFO)
186
        add_stream_logger('kamaki.clients.recv', logging.INFO)
187
    add_stream_logger(__name__, logging.WARNING)
197 188
    global kloger
198
    kloger = logging.getLogger('kamaki')
189
    kloger = get_logger(__name__)
199 190

  
200 191

  
201 192
def _init_session(arguments):

Also available in: Unified diff