proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 00:15:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

console: lxc_terminal_create_log_file()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-27 16:50:08 +01:00
parent 9bc780839b
commit 43366ca259
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lxc/commands.c
View File

@ -991,8 +991,7 @@ static int lxc_cmd_console_log_callback(int fd, struct lxc_cmd_req *req,
rsp.ret = 0; rsp.ret = 0;
if (log->clear) if (log->clear)
/* clear the ringbuffer */ lxc_ringbuf_clear(buf); /* clear the ringbuffer */
lxc_ringbuf_clear(buf);
else if (rsp.datalen > 0) else if (rsp.datalen > 0)
lxc_ringbuf_move_read_addr(buf, rsp.datalen); lxc_ringbuf_move_read_addr(buf, rsp.datalen);

4
src/lxc/console.c
View File

@ -822,7 +822,7 @@ static int lxc_terminal_create_ringbuf(struct lxc_pty *console)
* This is the console log file. Please note that the console log file is * This is the console log file. Please note that the console log file is
* (implementation wise not content wise) independent of the console ringbuffer. * (implementation wise not content wise) independent of the console ringbuffer.
*/ */
int lxc_console_create_log_file(struct lxc_pty *console) int lxc_terminal_create_log_file(struct lxc_pty *console)
{ {
if (!console->log_path) if (!console->log_path)
return 0; return 0;
@ -889,7 +889,7 @@ int lxc_console_create(struct lxc_conf *conf)
return -1; return -1;
/* create console log file */ /* create console log file */
ret = lxc_console_create_log_file(console); ret = lxc_terminal_create_log_file(console);
if (ret < 0) if (ret < 0)
goto err; goto err;

2
src/lxc/console.h
View File

@ -228,7 +228,7 @@ extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
extern void lxc_terminal_signal_fini(struct lxc_tty_state *ts); extern void lxc_terminal_signal_fini(struct lxc_tty_state *ts);
extern int lxc_terminal_write_ringbuffer(struct lxc_pty *console); extern int lxc_terminal_write_ringbuffer(struct lxc_pty *console);
extern int lxc_console_create_log_file(struct lxc_pty *console); extern int lxc_terminal_create_log_file(struct lxc_pty *console);
extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data, extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
struct lxc_epoll_descr *descr); struct lxc_epoll_descr *descr);