From cf87432e410cbe2ee61e90b8f4c2e8d2a75f09ca Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Fri, 5 Jun 2020 16:27:31 +0200 Subject: Split config into generic and dir watching parts --- main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 70d1b1e..f9df355 100644 --- a/main.c +++ b/main.c @@ -17,6 +17,7 @@ #include "uring.h" #include "config.h" #include "server.h" +#include "cfgdir.h" int debuglvl = 0; @@ -156,7 +157,7 @@ dump_tree(struct cfg *cfg) uring_task_refdump(&cfg->sev->task); uring_refdump(cfg->uev); if (cfg->iev) - inotify_refdump(cfg->iev); + cfgdir_refdump(cfg->iev); list_for_each_entry(server, &cfg->servers, list) server_refdump(server); fprintf(stderr, "============\n"); @@ -183,7 +184,7 @@ signalfd_read(struct cfg *cfg, struct uring_task *task, int res) } else { fprintf(stderr, "Got a signal to dump tree\n"); dump_tree(cfg); - scfg_stop_monitor_dir(cfg); + cfgdir_delete(cfg); list_for_each_entry_safe(server, stmp, &cfg->servers, list) server_delete(cfg, server); uring_read(cfg, &sev->task, &sev->buf, sizeof(sev->buf), 0, signalfd_read); @@ -274,9 +275,7 @@ main(int argc, char **argv) signalfd_init(cfg); - scfg_monitor_dir(cfg); - - scfg_read_all(cfg); + cfgdir_init(cfg); uring_event_loop(cfg); -- cgit v1.2.3