From 77071eb45391c9f0bbc593bcf2c10605ed1d5d17 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Mon, 22 Jun 2020 12:00:05 +0200
Subject: Rename proxy and cfgdir to more descriptive names

---
 main.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index da11e97..c240da2 100644
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@
 #include "uring.h"
 #include "config.h"
 #include "server.h"
-#include "cfgdir.h"
+#include "server-config.h"
 #include "announce.h"
 #include "systemd.h"
 #include "igmp.h"
@@ -568,14 +568,13 @@ dump_tree()
 	info("Dumping Tree");
 	info("============");
 	uring_task_refdump(&cfg->task);
-	uring_refdump(cfg->uev);
-	idle_refdump(cfg->idle);
 	if (cfg->sev)
 		uring_task_refdump(&cfg->sev->task);
-	igmp_refdump(cfg->igmp);
-	announce_refdump(cfg->aev);
-	if (cfg->iev)
-		cfgdir_refdump(cfg->iev);
+	uring_refdump();
+	idle_refdump();
+	igmp_refdump();
+	announce_refdump();
+	server_cfg_monitor_refdump();
 	list_for_each_entry(server, &cfg->servers, list)
 		server_refdump(server);
 	info("============");
@@ -642,11 +641,11 @@ signalfd_read(struct uring_task *task, int res)
 		verbose("got a signal to dump tree");
 		sd_notifyf(0, "STOPPING=1\nSTATUS=Received signal, exiting");
 		dump_tree();
-		uring_task_put(&sev->task);
+		uring_task_destroy(&sev->task);
 		igmp_delete();
 		announce_delete();
 		idle_delete();
-		cfgdir_delete();
+		server_cfg_monitor_delete();
 		list_for_each_entry_safe(server, stmp, &cfg->servers, list)
 			server_delete(server);
 		uring_delete();
@@ -753,7 +752,7 @@ main(int argc, char **argv)
 
 	signalfd_init();
 
-	cfgdir_init();
+	server_cfg_monitor_init();
 
 	announce_init();
 
-- 
cgit v1.2.3