diff -r -U4 syslog-ng-2.0.10/src/macros.c syslog-ng-2.0.10+msec/src/macros.c --- syslog-ng-2.0.10/src/macros.c 2007-09-22 15:39:08.000000000 +0100 +++ syslog-ng-2.0.10+msec/src/macros.c 2009-06-23 17:31:52.000000000 +0100 @@ -56,8 +56,10 @@ { "DAY", M_DAY }, { "HOUR", M_HOUR }, { "MIN", M_MIN }, { "SEC", M_SEC }, + { "MSEC", M_MSEC }, + { "USEC", M_USEC }, { "WEEKDAY", M_WEEKDAY }, { "WEEK", M_WEEK }, { "UNIXTIME", M_UNIXTIME }, { "TZOFFSET", M_TZOFFSET }, @@ -72,8 +74,10 @@ { "R_DAY", M_DAY_RECVD }, { "R_HOUR", M_HOUR_RECVD }, { "R_MIN", M_MIN_RECVD }, { "R_SEC", M_SEC_RECVD }, + { "R_MSEC", M_MSEC_RECVD }, + { "R_USEC", M_USEC_RECVD }, { "R_WEEKDAY", M_WEEKDAY_RECVD }, { "R_WEEK", M_WEEK_RECVD }, { "R_UNIXTIME", M_UNIXTIME_RECVD }, { "R_TZOFFSET", M_TZOFFSET_RECVD }, @@ -88,8 +92,10 @@ { "S_DAY", M_DAY_STAMP }, { "S_HOUR", M_HOUR_STAMP }, { "S_MIN", M_MIN_STAMP }, { "S_SEC", M_SEC_STAMP }, + { "S_MSEC", M_MSEC_STAMP }, + { "S_USEC", M_USEC_STAMP }, { "S_WEEKDAY", M_WEEKDAY_STAMP }, { "S_WEEK", M_WEEK_STAMP }, { "S_UNIXTIME", M_UNIXTIME_STAMP }, { "S_TZOFFSET", M_TZOFFSET_STAMP }, @@ -272,8 +278,10 @@ case M_DAY: case M_HOUR: case M_MIN: case M_SEC: + case M_MSEC: + case M_USEC: case M_TZOFFSET: case M_TZ: case M_UNIXTIME: @@ -288,8 +296,10 @@ case M_DAY_RECVD: case M_HOUR_RECVD: case M_MIN_RECVD: case M_SEC_RECVD: + case M_MSEC_RECVD: + case M_USEC_RECVD: case M_TZOFFSET_RECVD: case M_TZ_RECVD: case M_UNIXTIME_RECVD: @@ -304,8 +314,10 @@ case M_DAY_STAMP: case M_HOUR_STAMP: case M_MIN_STAMP: case M_SEC_STAMP: + case M_MSEC_STAMP: + case M_USEC_STAMP: case M_TZOFFSET_STAMP: case M_TZ_STAMP: case M_UNIXTIME_STAMP: { @@ -371,8 +383,14 @@ break; case M_SEC: g_string_sprintfa(result, "%02d", tm->tm_sec); break; + case M_MSEC: + g_string_sprintfa(result, "%03d", stamp->time.tv_usec / 1000); + break; + case M_USEC: + g_string_sprintfa(result, "%06d", stamp->time.tv_usec); + break; case M_DATE: case M_STAMP: case M_ISODATE: case M_FULLDATE: diff -r -U4 syslog-ng-2.0.10/src/macros.h syslog-ng-2.0.10+msec/src/macros.h --- syslog-ng-2.0.10/src/macros.h 2007-07-22 14:12:30.000000000 +0100 +++ syslog-ng-2.0.10+msec/src/macros.h 2009-06-23 17:56:07.000000000 +0100 @@ -52,8 +52,10 @@ M_DAY, M_HOUR, M_MIN, M_SEC, + M_MSEC, + M_USEC, M_WEEKDAY, M_WEEK, M_TZOFFSET, M_TZ, @@ -68,8 +70,10 @@ M_DAY_RECVD, M_HOUR_RECVD, M_MIN_RECVD, M_SEC_RECVD, + M_MSEC_RECVD, + M_USEC_RECVD, M_WEEKDAY_RECVD, M_WEEK_RECVD, M_TZOFFSET_RECVD, M_TZ_RECVD, @@ -84,8 +88,10 @@ M_DAY_STAMP, M_HOUR_STAMP, M_MIN_STAMP, M_SEC_STAMP, + M_MSEC_STAMP, + M_USEC_STAMP, M_WEEKDAY_STAMP, M_WEEK_STAMP, M_TZOFFSET_STAMP, M_TZ_STAMP, @@ -105,9 +111,9 @@ M_MATCH_REF_OFS=256 }; -#define M_TIME_MACROS 15 +#define M_TIME_MACROS 17 guint log_macro_lookup(gchar *macro, gint len);