faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sources: include hostname in selection log message

Browse source 
When selecting an NTP source, include the hostname in the log message.
This commit is contained in:
Miroslav Lichvar 2020-06-01 17:22:58 +02:00
parent b86c89460a
commit bc46174e98
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sources.c
View file

@ -573,6 +573,24 @@ log_selection_message(const char *format, const char *arg)
/* ================================================== */ /* ================================================== */
static void
log_selection_source(const char *format, SRC_Instance inst)
{
char buf[320], *name, *ntp_name;
name = source_to_string(inst);
ntp_name = inst->type == SRC_NTP ? NSR_GetName(inst->ip_addr) : NULL;
if (ntp_name && strcmp(name, ntp_name) != 0)
snprintf(buf, sizeof (buf), "%s (%s)", name, ntp_name);
else
snprintf(buf, sizeof (buf), "%s", name);
log_selection_message(format, buf);
}
/* ================================================== */
static int static int
compare_sort_elements(const void *a, const void *b) compare_sort_elements(const void *a, const void *b)
{ {
@ -1166,8 +1184,7 @@ SRC_SelectSource(SRC_Instance updated_inst)
} }
selected_source_index = max_score_index; selected_source_index = max_score_index;
log_selection_message("Selected source %s", log_selection_source("Selected source %s", sources[selected_source_index]);
source_to_string(sources[selected_source_index]));
/* New source has been selected, reset all scores */ /* New source has been selected, reset all scores */
for (i = 0; i < n_sources; i++) { for (i = 0; i < n_sources; i++) {

2
test/unit/sources.c
View file

@ -49,6 +49,7 @@ test_unit(void)
SCH_Initialise(); SCH_Initialise();
SRC_Initialise(); SRC_Initialise();
REF_Initialise(); REF_Initialise();
NSR_Initialise();
REF_SetMode(REF_ModeIgnore); REF_SetMode(REF_ModeIgnore);
@ -224,6 +225,7 @@ test_unit(void)
} }
} }
NSR_Finalise();
REF_Finalise(); REF_Finalise();
SRC_Finalise(); SRC_Finalise();
SCH_Finalise(); SCH_Finalise();