emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: Fix startup issue with remote sinks

Browse Source 
Only reset f_fime when the filed is in normal operation, not suspended,
otherwise the INET_SUSPEND_TIME handling is broken.

Signed-off-by: Johan Askerin <johan.askerin@gmail.com>
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Johan Askerin 2020-01-16 14:27:00 +01:00 committed by Joachim Nilsson
parent 773e69ea2e
commit 5bfe15f767
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/syslogd.c
View File

@ -1622,8 +1622,10 @@ static void fprintlog_first(struct filed *f, struct buf_msg *buffer)
/* Messages generated by syslogd itself may not have a timestamp */ /* Messages generated by syslogd itself may not have a timestamp */
check_timestamp(buffer); check_timestamp(buffer);
if (f->f_type != F_FORW_SUSP) {
f->f_time = timer_now(); f->f_time = timer_now();
f->f_prevcount = 0; f->f_prevcount = 0;
}
if (f->f_flags & RFC5424) if (f->f_flags & RFC5424)
iovcnt = fmt5424(buffer, RFC5424_DATEFMT, iov, NELEMS(iov)); iovcnt = fmt5424(buffer, RFC5424_DATEFMT, iov, NELEMS(iov));