master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prometheus: make sure microhttpd starts using epoll if supported (#1173)

Browse Source 
In some cases the prometheus server was started using SELECT even if
EPOLL was supported.
Some flags were changed in microhttpd and now we use MHD_VERSION to make
sure to use the right ones in all cases (support old version, for ubuntu
16.04 for ex).

This fixes the issue #1167

I also added a log to make sure we know which version is used,
especially to inform the user that the SELECT version might lead to
issues on highly used servers.
This commit is contained in:
Thibaut ACKERMANN 2023-03-20 02:04:04 +01:00 committed by GitHub
parent 43f8b873a7
commit 242eb78227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/apps/relay/prom_server.c
View File

@ -100,19 +100,25 @@ void start_prometheus_server(void) {
promhttp_set_active_collector_registry(NULL);
// some flags appeared first in microhttpd v0.9.53
unsigned int flags = MHD_USE_DUAL_STACK
#if MHD_USE_ERROR_LOG
#if MHD_VERSION >= 0x00095300
| MHD_USE_ERROR_LOG
#endif
;
if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) {
#if MHD_USE_EPOLL_INTERNAL_THREAD
#if MHD_VERSION >= 0x00095300
flags |= MHD_USE_EPOLL_INTERNAL_THREAD;
#else
flags |= MHD_USE_SELECT_INTERNALLY; // ubuntu 16.04
flags |= MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY; // old versions of microhttpd
#endif
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus exporter server will start using EPOLL\n");
} else {
flags |= MHD_USE_SELECT_INTERNALLY;
// Select() will not work if all 1024 first file-descriptors are used.
// In this case the prometheus server will be unreachable
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "prometheus exporter server will start using SELECT. "
"The exporter might be unreachable on highly used servers\n");
}
struct MHD_Daemon *daemon = promhttp_start_daemon(flags, turn_params.prometheus_port, NULL, NULL);
if (daemon == NULL) {