Revision 0d4a6d0a

b/Changelog
2 2

  
3 3
Bug Fixes:
4 4

  
5
- Stop shell from destroying the config instance
5 6

  
6 7
Changes:
7 8

  
b/kamaki/cli/command_shell.py
190 190
                    else:
191 191
                        instance = cls(dict(cmd_parser.arguments))
192 192
                    cmd_parser.update_arguments(instance.arguments)
193
                    instance.arguments.pop('config')
193
                    #instance.arguments.pop('config')
194 194
                    cmd_parser.arguments = instance.arguments
195 195
                    cmd_parser.syntax = '%s %s' % (
196 196
                        subcmd.path.replace('_', ' '), cls.syntax)
b/kamaki/cli/commands/__init__.py
33 33

  
34 34
from kamaki.logger import get_logger
35 35

  
36
log = get_logger('kamaki.cli')
36
log = get_logger(__name__)
37 37

  
38 38

  
39 39
class _command_init(object):
......
54 54
                self['config'].get('global', 'log_token') == 'on',
55 55
                self['config'].get('global', 'log_data') == 'on')
56 56
        except Exception as e:
57
            log.warning('Failed to read custom log settings: %s' % e)
58
            log.warning('\tdefaults for token and data logging are off')
59
            pass
57
            log.warning('Failed to read custom log settings:'
58
                '%s\n defaults for token and data logging are off' % e)
60 59

  
61 60
    def _update_max_threads(self):
62 61
        try:
......
64 63
            assert max_threads > 0
65 64
            self.client.MAX_THREADS = max_threads
66 65
        except Exception as e:
67
            log.warning('Failed to read custom thread settings: %s' % e)
68
            log.warning(
69
                '\tdefault for max threads is %s' % self.client.MAX_THREADS)
70
            pass
66
            log.warning('Failed to read custom thread settings: '
67
                '%s, use default max threads (%s)' % (
68
                    e, self.client.MAX_THREADS))
71 69

  
72 70
    def _safe_progress_bar(self, msg, arg='progress_bar'):
73 71
        """Try to get a progress bar, but do not raise errors"""

Also available in: Unified diff