[lxc-devel] [lxc/lxc] 861813: confile: add lxc.console.size

GitHub noreply at github.com
Tue Feb 27 21:07:57 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 861813e52bdba0cda7e3b72ba4932db77d47b08b
      https://github.com/lxc/lxc/commit/861813e52bdba0cda7e3b72ba4932db77d47b08b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M doc/lxc.container.conf.sgml.in
    M src/lxc/commands.c
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/console.c

  Log Message:
  -----------
  confile: add lxc.console.size

lxc.console.size regulates the size of the console log file. This is intended
to replace lxc.console.buffer.logfile. The current semantics are:

- if lxc.console.size is not set:
  - no limit is placed on the size of the log file
- if lxc.console.size is set:
  - if lxc.console.rotate is set and the next write would exceed the limit:
    - write as much as possible into the old log file
    - rotate the log file
    - write as much as posible into the new log file
    - discard remaining bytes (scenario shouldn't be possible in normal
      circumstances)
  - if lxc.console.rotate is not set and the next write would exceed the limit:
    - keep overwriting the current log file

To make the log file a mirror of the in-memory ringbuffer simply set:
lxc.console.buffer.size == lxc.console.size.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 23e0d9af767dc78639cf9572c78be6c274e48b86
      https://github.com/lxc/lxc/commit/23e0d9af767dc78639cf9572c78be6c274e48b86
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M doc/lxc.container.conf.sgml.in
    M src/lxc/commands.c
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/console.c
    M src/lxc/console.h
    M src/lxc/lxccontainer.h
    M src/tests/console_log.c

  Log Message:
  -----------
  confile: remove lxc.console.buffer.logfile

All of its functionality is now covered over by lxc.console.logfile.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 39c6cdb771a4375fb6cd465fbdcd005ca217f059
      https://github.com/lxc/lxc/commit/39c6cdb771a4375fb6cd465fbdcd005ca217f059
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  console: dump ringbuffer to disk on container exit

The console ringbuffer will be dumped to disk if the console log file is not
rotated and it's size is not unlimited. In the former two cases we will have
all data from the ringbuffer available anyway.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 89962c6c0c1f0d6f3b19401c5fbb87e6ead25421
      https://github.com/lxc/lxc/commit/89962c6c0c1f0d6f3b19401c5fbb87e6ead25421
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  console: always dump log file

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 7263b97f2c569b3832111ae398943274c05eea2d
      https://github.com/lxc/lxc/commit/7263b97f2c569b3832111ae398943274c05eea2d
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M doc/lxc.container.conf.sgml.in
    M src/lxc/commands.c
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/console.c
    M src/lxc/console.h
    M src/lxc/lxccontainer.h
    M src/tests/console_log.c

  Log Message:
  -----------
  Merge pull request #2167 from brauner/2018-02-15/simplify_console_logging

console: simplify console logging


Compare: https://github.com/lxc/lxc/compare/d931b24349ca...7263b97f2c56


More information about the lxc-devel mailing list