rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 12:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

imjournal bugfix: do not disable itself on error

Browse Source 
If some functions calls inside the main loop failed, imjournal exited
with an error code, actually disabling all logging from the journal.
This was probably never intended.

This patch makes imjournal recover the situation instead.

closes https://github.com/rsyslog/rsyslog/issues/1895
This commit is contained in:
Rainer Gerhards 2017-10-24 16:14:13 +02:00
parent 82f9c4486e
commit 27f96c84d3
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/imjournal/imjournal.c
View File

@ -298,6 +298,7 @@ readjournal(void)
/* Get syslog facility */
if (sd_journal_get_data(j, "SYSLOG_FACILITY", &get, &length) >= 0) {
// Note: the journal frequently contains invalid facilities!
if (length == 17 || length == 18) {
facility = ((char *)get)[16] - '0';
if (length == 18) {
@ -305,13 +306,13 @@ readjournal(void)
facility += ((char *)get)[17] - '0';
}
if (facility < 0 || 23 < facility) {
LogError(0, RS_RET_ERR, "The value of the 'FACILITY' field is "
DBGPRINTF("The value of the 'FACILITY' field is "
"out of bounds: %d, resetting\n", facility);
facility = cs.iDfltFacility;
}
} else {
LogError(0, RS_RET_ERR, "imjournal: The value of the 'FACILITY' field has an "
"unexpected length: %zu\n", length);
DBGPRINTF("The value of the 'FACILITY' field has an "
"unexpected length: %zu value: '%s'\n", length, (const char*)get);
}
}
@ -632,6 +633,16 @@ finalize_it:
RETiRet;
}
static void
tryRecover(void) {
LogMsg(0, RS_RET_OK, LOG_INFO, "imjournal: trying to recover from unexpected "
"journal error");
closeJournal();
srSleep(10, 0); // do not hammer machine with too-frequent retries
openJournal();
}
BEGINrunInput
int count = 0;
CODESTARTrunInput
@ -683,16 +694,22 @@ CODESTARTrunInput
r = sd_journal_next(j);
if (r < 0) {
LogError(-r, RS_RET_ERR, "imjournal: sd_journal_next() failed");
ABORT_FINALIZE(RS_RET_ERR);
tryRecover();
continue;
}
if (r == 0) {
/* No new messages, wait for activity. */
CHKiRet(pollJournal());
if(pollJournal() != RS_RET_OK) {
tryRecover();
}
continue;
}
CHKiRet(readjournal());
if(readjournal() != RS_RET_OK) {
tryRecover();
continue;
}
if (cs.stateFile) { /* can't persist without a state file */
/* TODO: This could use some finer metric. */
count++;