summaryrefslogtreecommitdiffstats
path: root/src/fastd.c
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-03-04 17:16:23 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-03-04 17:24:43 +0100
commit08a60265a27d6ec7cc11f95820e8160fafaf5c5d (patch)
treeb670e173b09f12327ec461cab22a8addb9cf9e24 /src/fastd.c
parent195be08c47edeaf28bf7c2371ccb4178bbeaae83 (diff)
downloadfastd-08a60265a27d6ec7cc11f95820e8160fafaf5c5d.tar
fastd-08a60265a27d6ec7cc11f95820e8160fafaf5c5d.zip
Load peer dirs in the last step of the configuration
Loading the peer dirs directly led to peers being discovered in a different order after reconfigure.
Diffstat (limited to 'src/fastd.c')
-rw-r--r--src/fastd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fastd.c b/src/fastd.c
index 380f6a2..686df31 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -1139,6 +1139,7 @@ int main(int argc, char *argv[]) {
init_peer_groups(&ctx);
init_peers(&ctx);
+ fastd_config_load_peer_dirs(&ctx, &conf);
if (conf.daemon) {
pid_t pid = fork();
@@ -1181,10 +1182,12 @@ int main(int argc, char *argv[]) {
if (sighup) {
sighup = false;
+ pr_info(&ctx, "reconfigure triggered");
+
close_log(&ctx);
init_log(&ctx);
- fastd_reconfigure(&ctx, &conf);
+ fastd_config_load_peer_dirs(&ctx, &conf);
}
if (dump) {