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 /plugins | |
| 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 'plugins')
| -rw-r--r-- | plugins/imfile/imfile.c | 1 | ||||
| -rw-r--r-- | plugins/imklog/imklog.c | 1 | ||||
| -rw-r--r-- | plugins/imtemplate/imtemplate.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index e8e10fca..b0211bf6 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -103,7 +103,6 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine) pMsg->iFacility = LOG_FAC(pInfo->iFacility); pMsg->iSeverity = LOG_PRI(pInfo->iSeverity); pMsg->bParseHOSTNAME = 0; - datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */ CHKiRet(submitMsg(pMsg)); finalize_it: RETiRet; diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 9fb2f239..84c32d11 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -106,7 +106,6 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity) pMsg->iFacility = LOG_FAC(iFacility); pMsg->iSeverity = LOG_PRI(iSeverity); pMsg->bParseHOSTNAME = 0; - datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */ CHKiRet(submitMsg(pMsg)); finalize_it: diff --git a/plugins/imtemplate/imtemplate.c b/plugins/imtemplate/imtemplate.c index c391d314..366408a0 100644 --- a/plugins/imtemplate/imtemplate.c +++ b/plugins/imtemplate/imtemplate.c @@ -269,7 +269,6 @@ CODESTARTrunInput pMsg->iFacility = LOG_FAC(pri); pMsg->iSeverity = LOG_PRI(pri); pMsg->bParseHOSTNAME = 0; - getCurrTime(&(pMsg->tTIMESTAMP)); / * use the current time! * / flags |= INTERNAL_MSG; logmsg(pMsg, flags); / * some time, CHKiRet() will work here, too [today NOT!] * / * |