diff --git a/daggyd/daggyd/daggyd.cpp b/daggyd/daggyd/daggyd.cpp index 69c4374..1204ff2 100644 --- a/daggyd/daggyd/daggyd.cpp +++ b/daggyd/daggyd/daggyd.cpp @@ -223,6 +223,10 @@ int main(int argc, char **argv) .implicit_value(true); args.add_argument("-d", "--daemon").default_value(false).implicit_value(true); args.add_argument("--config"); + args.add_argument("--ip").default_value(std::string{"127.0.0.1"}); + args.add_argument("--port").default_value(2503u).action( + [](const std::string &value) -> unsigned { return std::stoul(value); }); + try { args.parse_args(argc, argv); } @@ -232,9 +236,11 @@ int main(int argc, char **argv) exit(1); } - bool verbose = args.get("--verbose"); - bool asDaemon = args.get("--daemon"); - auto configFile = args.get("--config"); + bool verbose = args.get("--verbose"); + bool asDaemon = args.get("--daemon"); + auto configFile = args.get("--config"); + std::string listenIP = args.get("--ip"); + auto listenPort = args.get("--port"); std::ifstream ifh(configFile); std::string config; @@ -244,10 +250,8 @@ int main(int argc, char **argv) rj::Document doc; daggy::checkRJParse(doc.Parse(config.c_str())); - std::string listenIP = "127.0.0.1"; - int listenPort = 2503; - size_t webThreads = 50; - size_t dagThreads = 50; + size_t webThreads = 50; + size_t dagThreads = 50; if (doc.HasMember("ip")) listenIP = doc["ip"].GetString(); diff --git a/daggyr/daggyr/daggyr.cpp b/daggyr/daggyr/daggyr.cpp index de04de7..999a9c7 100644 --- a/daggyr/daggyr/daggyr.cpp +++ b/daggyr/daggyr/daggyr.cpp @@ -119,7 +119,8 @@ int main(int argc, char **argv) args.add_argument("-d", "--daemon").default_value(false).implicit_value(true); args.add_argument("--config").default_value(std::string{}); args.add_argument("--ip").default_value(std::string{"127.0.0.1"}); - args.add_argument("--port").default_value(2504u); + args.add_argument("--port").default_value(2504u).action( + [](const std::string &value) -> unsigned { return std::stoul(value); }); try { args.parse_args(argc, argv); @@ -138,7 +139,7 @@ int main(int argc, char **argv) bool asDaemon = args.get("--daemon"); auto configFile = args.get("--config"); std::string listenIP = args.get("--ip"); - int listenPort = args.get("--port"); + auto listenPort = args.get("--port"); size_t webThreads = 50; ssize_t maxCores = std::max(1U, std::thread::hardware_concurrency() - 2); ssize_t maxMemoryMB =