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

log: handle EINTR in read()

Browse Source 
We don't want to link log.{c,h} against utils.{c,h} for the sake of our static
builds init.lxc.static. This means lxc_write_nointr() will not be available. So
handle it EINTR.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-07-29 23:54:32 +02:00
parent a5bc6cb0e0
commit e0c198063d
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/log.c
View File

@ -290,7 +290,8 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
{ {
char buffer[LXC_LOG_BUFFER_SIZE]; char buffer[LXC_LOG_BUFFER_SIZE];
char date_time[LXC_LOG_TIME_SIZE]; char date_time[LXC_LOG_TIME_SIZE];
int n, ret; int n;
ssize_t ret;
int fd_to_use = -1; int fd_to_use = -1;
const char *log_container_name = log_vmname; const char *log_container_name = log_vmname;
@ -340,7 +341,12 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
buffer[n] = '\n'; buffer[n] = '\n';
return write(fd_to_use, buffer, n + 1); again:
ret = write(fd_to_use, buffer, n + 1);
if (ret < 0 && errno == EINTR)
goto again;
return ret;
} }
static struct lxc_log_appender log_appender_syslog = { static struct lxc_log_appender log_appender_syslog = {