From 8aded3556ed54457056fedc75341089469e29c51 Mon Sep 17 00:00:00 2001 From: Giacomo Vacca Date: Tue, 21 Sep 2021 17:26:48 +0200 Subject: [PATCH] Issue #699 Return codes for prom server --- src/apps/relay/mainrelay.c | 6 +++++- src/apps/relay/prom_server.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 3ed4a1d..b7c78c0 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -2589,9 +2589,13 @@ int main(int argc, char **argv) drop_privileges(); #if !defined(TURN_NO_PROMETHEUS) - if (start_prometheus_server()){ + int prometheus_status = start_prometheus_server(); + if (prometheus_status < 0) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Could not start Prometheus collector!\n"); } + else if (prometheus_status == 1) { + TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "Prometheus collector disabled, not started.\n"); + } else { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "Prometheus collector started successfully.\n"); } diff --git a/src/apps/relay/prom_server.c b/src/apps/relay/prom_server.c index 0bc69ab..0a9d5bc 100644 --- a/src/apps/relay/prom_server.c +++ b/src/apps/relay/prom_server.c @@ -62,7 +62,7 @@ int start_prometheus_server(void){ struct MHD_Daemon *daemon = promhttp_start_daemon(MHD_USE_SELECT_INTERNALLY, DEFAULT_PROM_SERVER_PORT, NULL, NULL); if (daemon == NULL) { - return 1; + return -1; } return 0; }