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

fixed a bug in RFC3339 timestamp generation; added support for 3339

Browse Source 
timestamps in internally-generated messages
This commit is contained in:
Rainer Gerhards 2005-11-23 17:44:58 +00:00
parent 46be94a0ae
commit 193a639b24
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,5 +1,9 @@
---------------------------------------------------------------------------
Version 1.12.2 (RGer), 2005-11-??
- fixed a bug in the RFC 3339 date formater. An extra space was added
after the actual timestamp
- added support for providing high-precision RFC3339 timestamps for
(rsyslogd-)internally-generated messages
---------------------------------------------------------------------------
Version 1.12.1 (RGer), 2005-11-23
- made multithreading work with BSD. Some signal-handling needed to be

8
syslogd.c
View File

@ -1838,7 +1838,7 @@ static int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf
char szFmtStr[64];
/* be careful: there is ONE actual %d in the format string below ;) */
snprintf(szFmtStr, sizeof(szFmtStr),
"%%04d-%%02d-%%02dT%%02d:%%02d:%%02d.%%0%dd%%c%%02d:%%02d ",
"%%04d-%%02d-%%02dT%%02d:%%02d:%%02d.%%0%dd%%c%%02d:%%02d",
ts->secfracPrecision);
iRet = snprintf(pBuf, iLenBuf, szFmtStr, ts->year, ts->month, ts->day,
ts->hour, ts->minute, ts->second, ts->secfrac,
@ -1846,7 +1846,7 @@ static int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf
}
else
iRet = snprintf(pBuf, iLenBuf,
"%4.4d-%2.2d-%2.2dT%2.2d:%2.2d:%2.2d%c%2.2d:%2.2d ",
"%4.4d-%2.2d-%2.2dT%2.2d:%2.2d:%2.2d%c%2.2d:%2.2d",
ts->year, ts->month, ts->day,
ts->hour, ts->minute, ts->second,
ts->OffsetMode, ts->OffsetHour, ts->OffsetMinute);
@ -3730,10 +3730,6 @@ void logmsg(int pri, struct msg *pMsg, int flags)
(void) time(&now);
if (flags & ADDDATE) {
getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
/* but modify it to be an RFC 3164 time... */
pMsg->tTIMESTAMP.timeType = 1;
pMsg->tTIMESTAMP.secfracPrecision = 0;
pMsg->tTIMESTAMP.secfrac = 0;
}
/* parse HOSTNAME - but only if this is network-received!