Merge "enable logging to file for quiet mode" into stable/ussuri
This commit is contained in:
commit
cdb9d2e512
|
@ -21,21 +21,33 @@ def make_a_logger(conf=None, image_name=None):
|
||||||
log = logging.getLogger(".".join([__name__, image_name]))
|
log = logging.getLogger(".".join([__name__, image_name]))
|
||||||
else:
|
else:
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
if conf is not None and conf.debug:
|
||||||
|
loglevel = logging.DEBUG
|
||||||
|
else:
|
||||||
|
loglevel = logging.INFO
|
||||||
|
|
||||||
if not log.handlers:
|
if not log.handlers:
|
||||||
if conf is None or not conf.logs_dir or not image_name:
|
stream_handler = logging.StreamHandler(sys.stderr)
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
stream_handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT))
|
||||||
log.propagate = False
|
# NOTE(hrw): quiet mode matters only on console
|
||||||
|
if conf is not None and conf.quiet:
|
||||||
|
stream_handler.setLevel(logging.CRITICAL)
|
||||||
else:
|
else:
|
||||||
|
stream_handler.setLevel(loglevel)
|
||||||
|
log.addHandler(stream_handler)
|
||||||
|
log.propagate = False
|
||||||
|
|
||||||
|
if conf is not None and conf.logs_dir and image_name:
|
||||||
filename = os.path.join(conf.logs_dir, "%s.log" % image_name)
|
filename = os.path.join(conf.logs_dir, "%s.log" % image_name)
|
||||||
handler = logging.FileHandler(filename, delay=True)
|
handler = logging.FileHandler(filename, delay=True)
|
||||||
handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT))
|
# NOTE(hrw): logfile will be INFO or DEBUG
|
||||||
log.addHandler(handler)
|
handler.setLevel(loglevel)
|
||||||
if conf is not None and conf.debug:
|
handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT))
|
||||||
log.setLevel(logging.DEBUG)
|
log.addHandler(handler)
|
||||||
elif conf is not None and conf.quiet and image_name:
|
|
||||||
log.setLevel(logging.CRITICAL)
|
# NOTE(hrw): needs to be high, handlers have own levels
|
||||||
else:
|
log.setLevel(logging.DEBUG)
|
||||||
log.setLevel(logging.INFO)
|
|
||||||
return log
|
return log
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Quiet mode (enabled with ``--quiet`` argument) can be combined with
|
||||||
|
``--logs-dir`` option now. Console output will be quiet as expected while
|
||||||
|
building output will be stored in separate log files.
|
|
@ -9,6 +9,7 @@
|
||||||
DEFAULT:
|
DEFAULT:
|
||||||
debug: true
|
debug: true
|
||||||
logs_dir: "{{ kolla_build_logs_dir }}"
|
logs_dir: "{{ kolla_build_logs_dir }}"
|
||||||
|
quiet: true
|
||||||
base: "{{ base_distro }}"
|
base: "{{ base_distro }}"
|
||||||
install_type: "{{ install_type }}"
|
install_type: "{{ install_type }}"
|
||||||
template_override: /etc/kolla/template_overrides.j2
|
template_override: /etc/kolla/template_overrides.j2
|
||||||
|
|
Loading…
Reference in New Issue