From 9a12fdfa2dcbcfcca6b3a764cee14576fad59396 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Fri, 29 Nov 2024 11:44:54 -0500 Subject: [PATCH] squash w/ [7229] Redesign startup/shutdown process. --- server/main_server/src/main.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/server/main_server/src/main.cpp b/server/main_server/src/main.cpp index 703836c938..222d7b5109 100644 --- a/server/main_server/src/main.cpp +++ b/server/main_server/src/main.cpp @@ -414,14 +414,7 @@ Environment Variables: // NOLINTNEXTLINE(bugprone-lambda-function-name) const auto do_validate = [fn = __func__](const auto& _config, const std::string& _schema_file) { - const auto resolver = [fn](const jsoncons::uri& _uri) { - if (g_logger_initialized) { - log_server::debug("{}: uri = [{}], path = [{}]", fn, _uri.string(), _uri.path()); - } - else { - fmt::print(stderr, "uri = [{}], path = [{}]\n", _uri.string(), _uri.path()); - } - + const auto resolver = [](const jsoncons::uri& _uri) { std::ifstream in{(irods::get_irods_home_directory() / _uri.path()).c_str()}; if (!in) { return jsoncons::json::null(); @@ -430,13 +423,6 @@ Environment Variables: return jsoncons::json::parse(in); }; - if (g_logger_initialized) { - log_server::debug("{}: JSON schema file = [{}]", fn, _schema_file); - } - else { - fmt::print(stderr, "{}: JSON schema file = [{}].\n", fn, _schema_file); - } - std::ifstream in{_schema_file}; if (!in) { return false;