diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 09:15:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 09:15:14 +0100 |
| commit | de7726cbf0957384cc9261ac47d6bf65906739b5 (patch) | |
| tree | 1d3dd581d5c2382c01d3bf39130b368ae0cc64e2 /runtime/msg.c | |
| parent | a27c67a590a4a6186ac79326fa3abe4b95ab10fc (diff) | |
| parent | d97ad63e218112d7cd3a390854b2918407804976 (diff) | |
| download | rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.gz rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.xz rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
runtime/datetime.h
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 2fd4cff7..21aa236d 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1217,10 +1217,12 @@ static inline char *getTimeReported(msg_t *pM, enum tplFormatTypes eFmt) switch(eFmt) { case tplFmtDefault: case tplFmtRFC3164Date: + case tplFmtRFC3164BuggyDate: MsgLock(pM); if(pM->pszTIMESTAMP3164 == NULL) { pM->pszTIMESTAMP3164 = pM->pszTimestamp3164; - datetime.formatTimestamp3164(&pM->tTIMESTAMP, pM->pszTIMESTAMP3164); + datetime.formatTimestamp3164(&pM->tTIMESTAMP, pM->pszTIMESTAMP3164, + (eFmt == tplFmtRFC3164BuggyDate)); } MsgUnlock(pM); return(pM->pszTIMESTAMP3164); @@ -1283,7 +1285,7 @@ static inline char *getTimeGenerated(msg_t *pM, enum tplFormatTypes eFmt) MsgUnlock(pM); return ""; } - datetime.formatTimestamp3164(&pM->tRcvdAt, pM->pszRcvdAt3164); + datetime.formatTimestamp3164(&pM->tRcvdAt, pM->pszRcvdAt3164, 0); } MsgUnlock(pM); return(pM->pszRcvdAt3164); @@ -1310,13 +1312,15 @@ static inline char *getTimeGenerated(msg_t *pM, enum tplFormatTypes eFmt) MsgUnlock(pM); return(pM->pszRcvdAt_PgSQL); case tplFmtRFC3164Date: + case tplFmtRFC3164BuggyDate: MsgLock(pM); if(pM->pszRcvdAt3164 == NULL) { if((pM->pszRcvdAt3164 = MALLOC(16)) == NULL) { MsgUnlock(pM); return ""; } - datetime.formatTimestamp3164(&pM->tRcvdAt, pM->pszRcvdAt3164); + datetime.formatTimestamp3164(&pM->tRcvdAt, pM->pszRcvdAt3164, + (eFmt == tplFmtRFC3164BuggyDate)); } MsgUnlock(pM); return(pM->pszRcvdAt3164); |