net/proxy rename listeners to handlers

iceboy233 · Sep 4, 2023 · 91658f1 · 91658f1
1 parent 0fedfba
commit 91658f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ miracle-proxy --config miracle.conf
 ### Socks 5 server
 
 ```
-listeners {
+handlers {
     "" {
         listen 127.0.0.1:1080
         type socks
@@ -44,7 +44,7 @@ listeners {
 ### Shadowsocks server
 
 ```
-listeners {
+handlers {
     "" {
         listen [::]:8388
         type shadowsocks
@@ -57,7 +57,7 @@ listeners {
 ### Socks 5 server, shadowsocks client (ss-local)
 
 ```
-listeners {
+handlers {
     "" {
         listen 127.0.0.1:1080
         type socks

diff --git a/net/proxy/proxy.cc b/net/proxy/proxy.cc
@@ -14,18 +14,26 @@ Proxy::Proxy(const any_io_executor &executor)
     : executor_(executor) {}
 
 void Proxy::load_config(const boost::property_tree::ptree &config) {
-    listeners_config_ = config.get_child("listeners", {});
+    handlers_config_ = config.get_child("handlers", {});
+    auto listeners_config = config.get_child("listeners", {});
+    if (!listeners_config.empty()) {
+        LOG(warning) << "listeners is deprecated, rename to handlers instead";
+        handlers_config_.insert(
+            handlers_config_.end(),
+            listeners_config.begin(),
+            listeners_config.end());
+    }
     connectors_config_ = config.get_child("connectors", {});
     if (connectors_config_.find("") == connectors_config_.not_found()) {
         boost::property_tree::ptree default_connector;
         default_connector.put("type", "system");
         connectors_config_.push_back({"", default_connector});
     }
-    create_listeners();
+    create_handlers();
 }
 
-void Proxy::create_listeners() {
-    for (const auto &pair : listeners_config_) {
+void Proxy::create_handlers() {
+    for (const auto &pair : handlers_config_) {
         const auto &config = pair.second;
         std::string listen_str = config.get<std::string>("listen", "");
         auto listen_endpoint = Endpoint::from_string(listen_str);

diff --git a/net/proxy/proxy.h b/net/proxy/proxy.h
@@ -26,10 +26,10 @@ class Proxy {
     const any_io_executor &executor() const { return executor_; }
 
 private:
-    void create_listeners();
+    void create_handlers();
 
     any_io_executor executor_;
-    boost::property_tree::ptree listeners_config_;
+    boost::property_tree::ptree handlers_config_;
     boost::property_tree::ptree connectors_config_;
     std::vector<std::unique_ptr<system::Listener>> listeners_;
     std::vector<std::unique_ptr<Handler>> handlers_;