peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-01 05:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: adjust Frr logging for staticd and ospfd

Browse Source 
Ensure Frr logs to the local2 syslog facility to allow sorting all
Frr (staticd, ospfd) logs into a dedicated /var/log/routing log file.

We activate OSPF debugging, but keep log level at 'informational' for
the time being.  The YANG model needs some sort of "knob" to toggle
debug messages when troubleshooting OSPF.

Fixes #541

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-08-28 19:14:47 +02:00
parent 8cafd6f568
commit 4c81ac978e
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
board/common/rootfs/etc/syslog.d/readme.txt
+1 -1
View File
@@ -2,7 +2,7 @@ Reserved facilities for logging in various subsystems:
- local0: rauc
- local1: containers
- local2:
- local2: routing (frr)
- local3:
- local5:
- local6: reserved
board/common/rootfs/etc/syslog.d/routing.conf
+1
View File
@@ -0,0 +1 @@
local2.* -/var/log/routing
board/common/rootfs/usr/lib/tmpfiles.d/frr.conf
+1
View File
@@ -0,0 +1 @@
d /var/run/frr 0755 frr frr -
src/confd/src/ietf-routing.c
+14 -2
View File
@@ -17,12 +17,14 @@
#define BFDD_CONF "/etc/frr/bfd_enabled" /* Just signal that bfd should be enabled*/
#define BFDD_CONF_NEXT BFDD_CONF "+"
#define FRR_STATIC_CONFIG "! Generated by Infix\n\
#define FRR_STATIC_CONFIG "! Generated by Infix confd\n\
frr defaults traditional\n\
hostname Router\n\
password zebra \n\
enable password zebra\n\
log syslog informational\n"
no log unique-id\n\
log syslog informational\n\
log facility local2\n"
int parse_ospf_interfaces(sr_session_ctx_t *session, struct lyd_node *areas, FILE *fp)
{
@@ -126,6 +128,14 @@ int parse_ospf_areas(sr_session_ctx_t *session, struct lyd_node *areas, FILE *fp
int parse_ospf(sr_session_ctx_t *session, struct lyd_node *ospf)
{
const char *static_debug = "! OSPF default debug\
debug ospf bfd\n \
debug ospf packet all detail\n \
debug ospf ism\n \
debug ospf nsm\n \
debug ospf default-information\n \
debug ospf nssa\n\
! OSPF configuration\n";
struct lyd_node *areas, *default_route;
const char *router_id;
int bfd_enabled = 0;
@@ -139,6 +149,8 @@ int parse_ospf(sr_session_ctx_t *session, struct lyd_node *ospf)
}
fputs(FRR_STATIC_CONFIG, fp);
fputs(static_debug, fp);
areas = lydx_get_child(ospf, "areas");
router_id = lydx_get_cattr(ospf, "explicit-router-id");
bfd_enabled = parse_ospf_interfaces(session, areas, fp);