proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: add RFC3164 logging timestamps

Browse Source 
This is old-style syslog, used among other things for /dev/log.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-04-08 14:28:43 +02:00 committed by David Lamparter
parent f6caaa6524
commit 243ff228a9
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/zlog.c
View File

@ -117,8 +117,14 @@ struct zlog_msg {
* Valid if ZLOG_TS_ISO8601 is set. * Valid if ZLOG_TS_ISO8601 is set.
* (0 if timestamp has not been formatted yet) * (0 if timestamp has not been formatted yet)
*/ */
uint32_t ts_flags;
char ts_str[32], *ts_dot, ts_zonetail[8]; char ts_str[32], *ts_dot, ts_zonetail[8];
uint32_t ts_flags;
/* "mmm dd hh:mm:ss" for 3164 legacy syslog - too dissimilar from
* the above, so just kept separately here.
*/
uint32_t ts_3164_flags;
char ts_3164_str[16];
/* at the time of writing, 16 args was the actual maximum of arguments /* at the time of writing, 16 args was the actual maximum of arguments
* to a single zlog call. Particularly printing flag bitmasks seems * to a single zlog call. Particularly printing flag bitmasks seems
@ -746,6 +752,35 @@ size_t zlog_msg_ts(struct zlog_msg *msg, struct fbuf *out, uint32_t flags)
} }
} }
size_t zlog_msg_ts_3164(struct zlog_msg *msg, struct fbuf *out, uint32_t flags)
{
flags &= ZLOG_TS_UTC;
if (!msg->ts_3164_str[0] || flags != msg->ts_3164_flags) {
/* these are "hardcoded" in RFC3164, so they're here too... */
static const char *const months[12] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
};
struct tm tm;
/* RFC3164 explicitly asks for local time, but common usage
* also includes UTC.
*/
if (flags & ZLOG_TS_UTC)
gmtime_r(&msg->ts.tv_sec, &tm);
else
localtime_r(&msg->ts.tv_sec, &tm);
snprintfrr(msg->ts_3164_str, sizeof(msg->ts_3164_str),
"%3s %2d %02d:%02d:%02d", months[tm.tm_mon],
tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
msg->ts_3164_flags = flags;
}
return bputs(out, msg->ts_3164_str);
}
void zlog_set_prefix_ec(bool enable) void zlog_set_prefix_ec(bool enable)
{ {
atomic_store_explicit(&zlog_ec, enable, memory_order_relaxed); atomic_store_explicit(&zlog_ec, enable, memory_order_relaxed);

4
lib/zlog.h
View File

@ -168,6 +168,10 @@ extern void zlog_msg_args(struct zlog_msg *msg, size_t *hdrlen,
extern size_t zlog_msg_ts(struct zlog_msg *msg, struct fbuf *out, extern size_t zlog_msg_ts(struct zlog_msg *msg, struct fbuf *out,
uint32_t flags); uint32_t flags);
/* "mmm dd hh:mm:ss" for RFC3164 syslog. Only ZLOG_TS_UTC for flags. */
extern size_t zlog_msg_ts_3164(struct zlog_msg *msg, struct fbuf *out,
uint32_t flags);
/* This list & struct implements the actual logging targets. It is accessed /* This list & struct implements the actual logging targets. It is accessed
* lock-free from all threads, and thus MUST only be changed atomically, i.e. * lock-free from all threads, and thus MUST only be changed atomically, i.e.
* RCU. * RCU.