From 922c5c3ab39746e2d573c8e5f0a5f1cc53900827 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Tue, 8 Apr 2025 15:42:56 +0200 Subject: [PATCH] - Fix fast_reload to print chroot with config file name. --- daemon/remote.c | 10 ++++++++-- doc/Changelog | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 50bdefd68..72c634513 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4262,7 +4262,10 @@ fr_read_config(struct fast_reload_thread* fr, struct config_file** newcfg) if(!config_read(*newcfg, fr->worker->daemon->cfgfile, fr->worker->daemon->chroot)) { config_delete(*newcfg); - if(!fr_output_printf(fr, "config_read %s failed: %s\n", + if(!fr_output_printf(fr, "config_read %s%s%s%s failed: %s\n", + (fr->worker->daemon->chroot?"worker->daemon->chroot?fr->worker->daemon->chroot:""), + (fr->worker->daemon->chroot?"> ":""), fr->worker->daemon->cfgfile, strerror(errno))) return 0; fr_send_notification(fr, fast_reload_notification_printout); @@ -4271,7 +4274,10 @@ fr_read_config(struct fast_reload_thread* fr, struct config_file** newcfg) if(fr_poll_for_quit(fr)) return 1; if(fr->fr_verb >= 1) { - if(!fr_output_printf(fr, "done read config file %s\n", + if(!fr_output_printf(fr, "done read config file %s%s%s%s\n", + (fr->worker->daemon->chroot?"worker->daemon->chroot?fr->worker->daemon->chroot:""), + (fr->worker->daemon->chroot?"> ":""), fr->worker->daemon->cfgfile)) return 0; fr_send_notification(fr, fast_reload_notification_printout); diff --git a/doc/Changelog b/doc/Changelog index 7d3ea168b..88ee61312 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 8 April 2025: Wouter - Tag for 1.23.0rc1. + - Fix fast_reload to print chroot with config file name. 7 April 2025: Yorgos - Merge #902: DNS Error Reporting (RFC 9567). Introduces new -- 2.47.2