tools: remove ioContextRunner
Change-Id: I0ce66802ef962d8ff01ffea800224b2d2ed72ac4
diff --git a/tools/dsh/dsh.cpp b/tools/dsh/dsh.cpp
index 8456612..5f32d4e 100644
--- a/tools/dsh/dsh.cpp
+++ b/tools/dsh/dsh.cpp
@@ -92,22 +92,12 @@
const std::string& turn_pass,
const std::string& turn_realm,
bool anonymous)
- :logger(dht::log::getStdLogger())
- , ioContext(std::make_shared<asio::io_context>()),
+ :logger(dht::log::getStdLogger()),
+ ioContext(std::make_shared<asio::io_context>()),
iceFactory(std::make_shared<IceTransportFactory>(logger)),
certStore(std::make_shared<tls::CertificateStore>(cachePath()/"certstore", logger)),
trustStore(std::make_shared<tls::TrustStore>(*certStore))
{
- ioContext = std::make_shared<asio::io_context>();
- ioContextRunner = std::thread([context = ioContext, logger = logger] {
- try {
- auto work = asio::make_work_guard(*context);
- context->run();
- } catch (const std::exception& ex) {
- if (logger)
- logger->error("Error in ioContextRunner: {}", ex.what());
- }
- });
auto ca = identity.second->issuer;
trustStore->setCertificateStatus(ca->getId().toString(), tls::TrustStore::PermissionStatus::ALLOWED);
// Build a server
@@ -272,7 +262,6 @@
dhtnet::Dsh::~Dsh()
{
ioContext->stop();
- ioContextRunner.join();
}
} // namespace dhtnet
\ No newline at end of file
diff --git a/tools/dsh/dsh.h b/tools/dsh/dsh.h
index ec983a2..1c8759e 100644
--- a/tools/dsh/dsh.h
+++ b/tools/dsh/dsh.h
@@ -52,7 +52,6 @@
std::shared_ptr<tls::CertificateStore> certStore {nullptr};
std::shared_ptr<dhtnet::IceTransportFactory> iceFactory {nullptr};
std::shared_ptr<asio::io_context> ioContext;
- std::thread ioContextRunner;
std::shared_ptr<tls::TrustStore> trustStore;
};