fixed some

Author: dayu521

main.cpp

@@ -52,20 +52,19 @@ int main(int argc, char **argv)
         }
         auto c = hcpp::config::get_config(cfg_path);
         c->config_to(hcpp::slow_dns::get_slow_dns());
-        // c->save_callback([sd = hcpp::slow_dns::get_slow_dns()](auto &&cs)
-        //                  { sd->save_hm(cs.hm_); });
 
         asio::io_context io_context;
 
-        hcpp::nc=std::make_shared<hcpp::notify_channel>(io_context,1);
+        hcpp::nc = std::make_shared<hcpp::notify_channel>(io_context, 1);
 
         asio::signal_set signals(io_context, SIGINT, SIGTERM);
         signals.async_wait([&](auto, auto)
                            { io_context.stop(); });
 
         hcpp::httpserver hs;
         hcpp::mimt_https_server mhs;
-        if(!c->config_to(mhs)){
+        if (!c->config_to(mhs))
+        {
             return -1;
         }
 
@@ -76,15 +75,28 @@ int main(int argc, char **argv)
                     }
                       return c; });
 
-        co_spawn(io_context, hs.wait_http(c->get_port()), detached);
-        co_spawn(io_context, mhs.wait_c(10,c->get_proxy_service()), detached);
-        // co_spawn(io_context, []()->asio::awaitable<void>{co_await hcpp::nc->async_send(asio::error_code{}, "ok");}, detached);
+        auto exit_handler = [&io_context](auto &&eptr)
+        {
+            try
+            {
+                if (eptr)
+                    std::rethrow_exception(eptr);
+            }
+            catch (const std::exception &e)
+            {
+                log::error("exit_handler: {}", e.what());
+                io_context.stop();
+            }
+        };
+
+        co_spawn(io_context, hs.wait_http(c->get_port()), exit_handler);
+        co_spawn(io_context, mhs.wait_c(10, c->get_proxy_service()), exit_handler);
 
         auto create_thread = [&](auto self, int i) -> void
         {
             if (i > 0)
             {
-                spdlog::debug("线程{}创建成功",i);
+                spdlog::debug("线程{}创建成功", i);
                 std::jthread j(self, self, i - 1);
                 while (!io_context.stopped())
                 {
@@ -98,7 +110,7 @@ int main(int argc, char **argv)
                     }
                 }
                 j.join();
-                spdlog::debug("线程{}退出成功",i);
+                spdlog::debug("线程{}退出成功", i);
             }
         };
         // 为了防止对象在多线程情况下销毁出问题

src/dns.cpp

@@ -46,7 +46,6 @@ namespace hcpp
 
         std::shared_mutex smutex_;
         std::map<host_edp, edp_lists> edp_cache_;
-        std::unique_ptr<tcp_resolver> resolver_;
         bool has_init_;
         bool has_save_;
 
@@ -62,8 +61,18 @@ namespace hcpp
 
         void remove(host_edp hedp);
 
-        //BUG 析构时使用锁
-        ~slow_dns_imp()=default;
+        ~slow_dns_imp()
+        {
+            {
+                std::unique_lock<std::mutex> lk(rmutex_);
+                resolve_running_.clear();
+            }
+
+            {
+                std::unique_lock<std::shared_mutex> lk(smutex_);
+                edp_cache_.clear();
+            }
+        }
     };
     namespace
     {
@@ -90,7 +99,7 @@ namespace hcpp
                 tcp_socket s(c);
                 co_await asio::async_connect(s, endpoints);
 
-                auto ssl_m = std::make_shared<ssl_sock_mem>(provider.host_,"https");
+                auto ssl_m = std::make_shared<ssl_sock_mem>(provider.host_, "https");
                 ssl_m->init_client(std::move(s));
                 co_await ssl_m->async_handshake();
                 co_await ssl_m->wait();

src/http/http_svc_keeper.cpp

@@ -51,6 +51,18 @@ namespace hcpp
         awaitable<void> get_endpoint(const std::string &host, const std::string &service, std::shared_ptr<hcpp::slow_dns> dns, std::shared_ptr<channel> c);
         void return_back(const std::string &host, const std::string &service, std::shared_ptr<memory> m);
         bool remove_endpoint(std::string host, std::string service);
+
+        ~imp()
+        {
+            {
+                std::unique_lock<std::shared_mutex> lk(shm_rq_);
+                request_queue_.clear();
+            }
+            {
+                std::unique_lock<std::shared_mutex> lk(shm_c_);
+                cache_.clear();
+            }
+        }
     };
 
     class failed_mem : public simple_mem
@@ -337,8 +349,8 @@ namespace hcpp
         auto sock = co_await make_socket(host, service);
         if (sock)
         {
-            auto ss= std::make_shared<socket_memory>(std::move(*sock));
-            ss->host_=host;
+            auto ss = std::make_shared<socket_memory>(std::move(*sock));
+            ss->host_ = host;
             co_return ss;
         }
         co_return std::shared_ptr<memory>{};