Skip to content

Commit

Permalink
squash w/ [7229] Redesign startup/shutdown process.
Browse files Browse the repository at this point in the history
  • Loading branch information
korydraughn committed Nov 29, 2024
1 parent 6f6c57f commit 9a12fdf
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions server/main_server/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down

0 comments on commit 9a12fdf

Please sign in to comment.