diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-06 12:07:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-06 12:07:53 +0200 |
| commit | b849df20045ca5dfec36cdff5641e8a78d326b49 (patch) | |
| tree | 7c518f7679e19ef498e81f1b7fcfea553bb67717 /tools/syslogd.c | |
| parent | 1e53745dc9f11a90c613d177b2caba563c2b83be (diff) | |
| parent | 39000a62024510cd62607200e6100e3cd7c05005 (diff) | |
| download | rsyslog-b849df20045ca5dfec36cdff5641e8a78d326b49.tar.gz rsyslog-b849df20045ca5dfec36cdff5641e8a78d326b49.tar.xz rsyslog-b849df20045ca5dfec36cdff5641e8a78d326b49.zip | |
Merge branch 'master' into perf
Conflicts:
ChangeLog
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 0f6a4bd1..b576bb6d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -914,7 +914,6 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags) pMsg->iFacility = LOG_FAC(pri); pMsg->iSeverity = LOG_PRI(pri); pMsg->bParseHOSTNAME = 0; - datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */ flags |= INTERNAL_MSG; /* we now check if we should print internal messages out to stderr. This was @@ -1328,7 +1327,6 @@ static int parseRFCSyslogMsg(msg_t *pMsg, int flags) */ /* TIMESTAMP */ - memcpy(&pMsg->tTIMESTAMP, &pMsg->tRcvdAt, sizeof(struct syslogTime)); if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP), &p2parse) == RS_RET_OK) { if(flags & IGNDATE) { /* we need to ignore the msg data, so simply copy over reception date */ @@ -1415,7 +1413,6 @@ static int parseLegacySyslogMsg(msg_t *pMsg, int flags) * message. There we go from high-to low precison and are done * when we find a matching one. -- rgerhards, 2008-09-16 */ - memcpy(&pMsg->tTIMESTAMP, &pMsg->tRcvdAt, sizeof(struct syslogTime)); if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP), &p2parse) == RS_RET_OK) { /* we are done - parse pointer is moved by ParseTIMESTAMP3339 */; } else if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &p2parse) == RS_RET_OK) { |