diff --git a/Boss/Mod/ChannelCandidateInvestigator/Manager.cpp b/Boss/Mod/ChannelCandidateInvestigator/Manager.cpp index 38ef800c9..1b2a9da68 100644 --- a/Boss/Mod/ChannelCandidateInvestigator/Manager.cpp +++ b/Boss/Mod/ChannelCandidateInvestigator/Manager.cpp @@ -12,6 +12,7 @@ #include"Boss/Msg/SolicitChannelCandidates.hpp" #include"Boss/Msg/SolicitStatus.hpp" #include"Boss/Msg/TimerRandomHourly.hpp" +#include"Boss/concurrent.hpp" #include"Boss/log.hpp" #include"Boss/random_engine.hpp" #include"Ev/map.hpp" @@ -72,7 +73,9 @@ void Manager::start() { tx.commit(); if (good_candidates < min_good_candidates) - return solicit_candidates(good_candidates); + return Boss::concurrent( + solicit_candidates(good_candidates) + ); return Ev::lift(); }); diff --git a/Boss/Mod/ConnectFinderByDns.cpp b/Boss/Mod/ConnectFinderByDns.cpp index 2400e6128..fd9b784b1 100644 --- a/Boss/Mod/ConnectFinderByDns.cpp +++ b/Boss/Mod/ConnectFinderByDns.cpp @@ -4,6 +4,7 @@ #include"Boss/Msg/ProposeConnectCandidates.hpp" #include"Boss/Msg/Network.hpp" #include"Boss/Msg/SolicitConnectCandidates.hpp" +#include"Boss/concurrent.hpp" #include"Boss/log.hpp" #include"Boss/random_engine.hpp" #include"DnsSeed/get.hpp" @@ -140,13 +141,16 @@ class ConnectFinderByDns::Impl { }); }); }; - return Ev::map(std::move(f), it->second - ).then([this](DnsSeeds n_seeds) { + auto code = Ev::map(std::move(f), it->second + ).then([this + ](DnsSeeds n_seeds + ) { dnsseeds = Util::make_unique( std::move(n_seeds) ); return check_dnsseeds(); }); + return Boss::concurrent(std::move(code)); } return Boss::log( bus, Warn , "DnsSeed: Cannot seed by DNS: %s" diff --git a/ChangeLog b/ChangeLog index 4b89b0480..96f74b071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +0.5B +- Do not delay response to `init`. + 0.5A - Handle `rpc_command` specially for better RPC response times even when CLBOSS is busy. - Make compilable on FreeBSD. diff --git a/configure.ac b/configure.ac index 976d2a7d6..c6e84f11f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([clboss], [0.5A], [ZmnSCPxj@protonmail.com]) +AC_INIT([clboss], [0.5B], [ZmnSCPxj@protonmail.com]) AC_CONFIG_AUX_DIR([auxdir]) AM_INIT_AUTOMAKE([subdir-objects tar-ustar]) AC_CONFIG_SRCDIR([main.cpp])