diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-08 03:06:07 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@users.noreply.github.com> | 2017-05-18 14:07:28 -0400 |
| commit | b85120bcb3af24cc35b97cf1fe0a96e54f3cbb6e (patch) | |
| tree | d2805da49f11ef7e1c38624a0181328353479ad8 /lib/libfrr.c | |
| parent | 4d2d73c281b64d7e83a46f7e698a6e8b15f43615 (diff) | |
lib: detangle protocol name/instance from logging
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/libfrr.c')
| -rw-r--r-- | lib/libfrr.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c index 16681fe578..ff4160a243 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -36,6 +36,9 @@ const char frr_sysconfdir[] = SYSCONFDIR; const char frr_vtydir[] = DAEMON_VTY_DIR; const char frr_moduledir[] = MODULE_PATH; +char frr_protoname[] = "NONE"; +char frr_protonameinst[] = "NONE"; + char config_default[256]; static char pidfile_default[256]; static char vtypath_default[256]; @@ -164,6 +167,9 @@ void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv) frr_sysconfdir, di->name); snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid", frr_vtydir, di->name); + + strlcpy(frr_protoname, di->logname, sizeof(frr_protoname)); + strlcpy(frr_protonameinst, di->logname, sizeof(frr_protonameinst)); } void frr_opt_add(const char *optstr, const struct option *longopts, @@ -337,6 +343,10 @@ struct thread_master *frr_init(void) srandom(time(NULL)); + if (di->instance) + snprintf(frr_protonameinst, sizeof(frr_protonameinst), + "%s[%u]", di->logname, di->instance); + openzlog (di->progname, di->logname, di->instance, LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); #if defined(HAVE_CUMULUS) |