shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

Merge pull request #2287 from dandedrick/journal-gatewayd-timeout-fix

Browse Source 
journal-gatewayd: timeout journal wait to allow thread cleanup
This commit is contained in:
Daniel Mack 2016-01-08 09:25:21 +01:00
commit cf6c8c46fc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal-remote/journal-gatewayd.c
View File

@ -45,6 +45,8 @@
#include "sigbus.h"
#include "util.h"
#define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC)
static char *arg_key_pem = NULL;
static char *arg_cert_pem = NULL;
static char *arg_trust_pem = NULL;
@ -181,11 +183,13 @@ static ssize_t request_reader_entries(
} else if (r == 0) {
if (m->follow) {
r = sd_journal_wait(m->journal, (uint64_t) -1);
r = sd_journal_wait(m->journal, (uint64_t) JOURNAL_WAIT_TIMEOUT);
if (r < 0) {
log_error_errno(r, "Couldn't wait for journal event: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
}
if (r == SD_JOURNAL_NOP)
break;
continue;
}
@ -241,6 +245,8 @@ static ssize_t request_reader_entries(
}
n = m->size - pos;
if (n < 1)
return 0;
if (n > max)
n = max;