kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "astfd: With RLIMIT_NOFILE only the current value is sensible."

Browse Source
This commit is contained in:
Joshua Colp
2016-06-10 13:46:48 -05:00
committed by Gerrit Code Review
parent 4eb8cf2684 0bf1a53db3
commit d1006faba9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/astfd.c
View File

@@ -276,10 +276,10 @@ static char *handle_show_fd(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
return NULL; return NULL;
} }
getrlimit(RLIMIT_NOFILE, &rl); getrlimit(RLIMIT_NOFILE, &rl);
if (rl.rlim_cur == RLIM_INFINITY || rl.rlim_max == RLIM_INFINITY) { if (rl.rlim_cur == RLIM_INFINITY) {
ast_copy_string(line, "unlimited", sizeof(line)); ast_copy_string(line, "unlimited", sizeof(line));
} else { } else {
snprintf(line, sizeof(line), "%d/%d", (int) rl.rlim_cur, (int) rl.rlim_max); snprintf(line, sizeof(line), "%d", (int) rl.rlim_cur);
} }
ast_cli(a->fd, "Current maxfiles: %s\n", line); ast_cli(a->fd, "Current maxfiles: %s\n", line);
for (i = 0; i < ARRAY_LEN(fdleaks); i++) { for (i = 0; i < ARRAY_LEN(fdleaks); i++) {