From 19b0dcac5a4fc6e9fb50334450265a9a263748f0 Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Thu, 20 Apr 2023 17:37:18 +0000 Subject: [PATCH] Don't build the routing tree until absolutely necessary. Saves us a lot of time and memory in case of an error. --- src/Main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Main.c b/src/Main.c index 767ee7a..62082ab 100644 --- a/src/Main.c +++ b/src/Main.c @@ -237,15 +237,6 @@ start: Log(LOG_DEBUG, "Opened database."); } - Log(LOG_NOTICE, "Building routing tree..."); - matrixArgs.router = RouterBuild(); - if (!matrixArgs.router) - { - Log(LOG_ERR, "Unable to build routing tree."); - exit = EXIT_FAILURE; - goto finish; - } - if (!ConfigExists(matrixArgs.db)) { char *token; @@ -525,6 +516,15 @@ start: Log(LOG_NOTICE, "Starting job scheduler..."); CronStart(cron); + Log(LOG_NOTICE, "Building routing tree..."); + matrixArgs.router = RouterBuild(); + if (!matrixArgs.router) + { + Log(LOG_ERR, "Unable to build routing tree."); + exit = EXIT_FAILURE; + goto finish; + } + Log(LOG_NOTICE, "Starting server..."); for (i = 0; i < ArraySize(httpServers); i++)