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

Use bool to enable prometheus (#1779)

Browse Source 
`turn_params.prometheus` is bool but used as int throughout the code
`turn_params,prometheus_username_labels` is bool but in one place is set
with 1

This PR changes 0 and 1 to false and true accordingly
This commit is contained in:
Pavel Punsky 2025-12-08 08:43:36 -08:00 committed by GitHub
parent a668d4b4cc
commit 265d1029e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -83,3 +83,4 @@ Thumbs.db
# -------- # --------
*.dll *.dll
*.exe *.exe
.cache/*

4
src/apps/relay/mainrelay.c
View File

@ -2214,7 +2214,7 @@ static void set_option(int c, char *value) {
break; break;
#endif #endif
case PROMETHEUS_OPT: case PROMETHEUS_OPT:
turn_params.prometheus = 1; turn_params.prometheus = true;
break; break;
case PROMETHEUS_PORT_OPT: case PROMETHEUS_PORT_OPT:
turn_params.prometheus_port = atoi(value); turn_params.prometheus_port = atoi(value);
@ -2226,7 +2226,7 @@ static void set_option(int c, char *value) {
STRCPY(turn_params.prometheus_path, value); STRCPY(turn_params.prometheus_path, value);
break; break;
case PROMETHEUS_ENABLE_USERNAMES_OPT: case PROMETHEUS_ENABLE_USERNAMES_OPT:
turn_params.prometheus_username_labels = 1; turn_params.prometheus_username_labels = true;
break; break;
case AUTH_SECRET_OPT: case AUTH_SECRET_OPT:
turn_params.use_auth_secret_with_timestamp = 1; turn_params.use_auth_secret_with_timestamp = 1;

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

@ -112,7 +112,7 @@ MHD_RESULT promhttp_handler(void *cls, struct MHD_Connection *connection, const
} }
void start_prometheus_server(void) { void start_prometheus_server(void) {
if (turn_params.prometheus == 0) { if (!turn_params.prometheus) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus collector disabled, not started\n"); TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus collector disabled, not started\n");
return; return;
} }
@ -238,7 +238,7 @@ void start_prometheus_server(void) {
void prom_set_finished_traffic(const char *realm, const char *user, unsigned long rsvp, unsigned long rsvb, void prom_set_finished_traffic(const char *realm, const char *user, unsigned long rsvp, unsigned long rsvb,
unsigned long sentp, unsigned long sentb, bool peer) { unsigned long sentp, unsigned long sentb, bool peer) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
const char *label[] = {realm, NULL}; const char *label[] = {realm, NULL};
if (turn_params.prometheus_username_labels) { if (turn_params.prometheus_username_labels) {
@ -270,33 +270,33 @@ void prom_set_finished_traffic(const char *realm, const char *user, unsigned lon
} }
void prom_inc_allocation(SOCKET_TYPE type) { void prom_inc_allocation(SOCKET_TYPE type) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
const char *label[] = {socket_type_name(type)}; const char *label[] = {socket_type_name(type)};
prom_gauge_inc(turn_total_allocations, label); prom_gauge_inc(turn_total_allocations, label);
} }
} }
void prom_dec_allocation(SOCKET_TYPE type) { void prom_dec_allocation(SOCKET_TYPE type) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
const char *label[] = {socket_type_name(type)}; const char *label[] = {socket_type_name(type)};
prom_gauge_dec(turn_total_allocations, label); prom_gauge_dec(turn_total_allocations, label);
} }
} }
void prom_inc_stun_binding_request(void) { void prom_inc_stun_binding_request(void) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
prom_counter_add(stun_binding_request, 1, NULL); prom_counter_add(stun_binding_request, 1, NULL);
} }
} }
void prom_inc_stun_binding_response(void) { void prom_inc_stun_binding_response(void) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
prom_counter_add(stun_binding_response, 1, NULL); prom_counter_add(stun_binding_response, 1, NULL);
} }
} }
void prom_inc_stun_binding_error(void) { void prom_inc_stun_binding_error(void) {
if (turn_params.prometheus == 1) { if (turn_params.prometheus) {
prom_counter_add(stun_binding_error, 1, NULL); prom_counter_add(stun_binding_error, 1, NULL);
} }
} }