matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #16542 from donaldsharp/vtysh_stupidly_large

Browse source 
lib: Don't print warning if not a daemon
This commit is contained in:
Donatas Abraitis 2024-08-11 11:43:46 +03:00 committed by GitHub
parent 3875588ece cecf5716d5
commit 423e8076b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/event.c
View file

@ -555,8 +555,9 @@ struct event_loop *event_master_create(const char *name)
} }
if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) { if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) {
zlog_warn("FD Limit set: %u is stupidly large. Is this what you intended? Consider using --limit-fds also limiting size to %u", if (frr_is_daemon())
rv->fd_limit, STUPIDLY_LARGE_FD_SIZE); zlog_warn("FD Limit set: %u is stupidly large. Is this what you intended? Consider using --limit-fds also limiting size to %u",
rv->fd_limit, STUPIDLY_LARGE_FD_SIZE);
rv->fd_limit = STUPIDLY_LARGE_FD_SIZE; rv->fd_limit = STUPIDLY_LARGE_FD_SIZE;
} }

8
lib/libfrr.c
View file

@ -1476,3 +1476,11 @@ const char *frr_vers2str(uint32_t version, char *buf, int buflen)
return buf; return buf;
} }
bool frr_is_daemon(void)
{
if (di)
return true;
return false;
}

2
lib/libfrr.h
View file

@ -190,7 +190,7 @@ extern const char *frr_get_progname(void);
extern enum frr_cli_mode frr_get_cli_mode(void); extern enum frr_cli_mode frr_get_cli_mode(void);
extern uint32_t frr_get_fd_limit(void); extern uint32_t frr_get_fd_limit(void);
extern bool frr_is_startup_fd(int fd); extern bool frr_is_startup_fd(int fd);
extern bool frr_is_daemon(void);
/* call order of these hooks is as ordered here */ /* call order of these hooks is as ordered here */
DECLARE_HOOK(frr_early_init, (struct event_loop * tm), (tm)); DECLARE_HOOK(frr_early_init, (struct event_loop * tm), (tm));
DECLARE_HOOK(frr_late_init, (struct event_loop * tm), (tm)); DECLARE_HOOK(frr_late_init, (struct event_loop * tm), (tm));