From c4b5b641bba3c622afa09ed274b370adb0d3c271 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 4 May 2020 13:14:46 -0400 Subject: [PATCH] default to default data dir given by params instead --- llarp/config/config.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp index dbf716420..d823dcb48 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp @@ -71,14 +71,13 @@ namespace llarp conf.defineOption("router", "nickname", false, "", AssignmentAcceptor(m_nickname)); - conf.defineOption( - "router", "data-dir", false, GetDefaultDataDir(), [this](std::string arg) { - fs::path dir = arg; - if (not fs::exists(dir)) + conf.defineOption( + "router", "data-dir", false, params.defaultDataDir, [this](fs::path arg) { + if (not fs::exists(arg)) throw std::runtime_error( stringify("Specified [router]:data-dir ", arg, " does not exist")); - m_dataDir = std::move(dir); + m_dataDir = std::move(arg); }); conf.defineOption("router", "public-address", false, "", [this](std::string arg) {