Merge pull request #142 from zhengjian526/master

qicosmos · Jul 26, 2024 · 35761ed · 35761ed
2 parents aa02a75 + 5ef4002
commit 35761ed
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/include/rest_rpc/router.h b/include/rest_rpc/router.h
@@ -50,16 +50,24 @@ class router : asio::noncopyable {
   template <bool is_pub = false, typename Function>
   void register_handler(std::string const &name, Function f, bool pub = false) {
     uint32_t key = MD5::MD5Hash32(name.data());
-    key2func_name_.emplace(key, name);
-    return register_nonmember_func<is_pub>(key, std::move(f));
+    if (key2func_name_.find(key) != key2func_name_.end()) {
+      throw std::invalid_argument("duplicate registration key !");
+    } else {
+      key2func_name_.emplace(key, name);
+      return register_nonmember_func<is_pub>(key, std::move(f));
+    }
   }
 
   template <bool is_pub = false, typename Function, typename Self>
   void register_handler(std::string const &name, const Function &f,
                         Self *self) {
     uint32_t key = MD5::MD5Hash32(name.data());
-    key2func_name_.emplace(key, name);
-    return register_member_func<is_pub>(key, f, self);
+    if (key2func_name_.find(key) != key2func_name_.end()) {
+      throw std::invalid_argument("duplicate registration key !");
+    } else {
+      key2func_name_.emplace(key, name);
+      return register_member_func<is_pub>(key, f, self);
+    }
   }
 
   void remove_handler(std::string const &name) {

diff --git a/tests/test_rest_rpc.cpp b/tests/test_rest_rpc.cpp
@@ -487,6 +487,26 @@ TEST_CASE("test_server_delay_response") {
   server.async_run();
   std::this_thread::sleep_for(std::chrono::milliseconds(200));
 
+  rpc_client client("127.0.0.1", 9000);
+  bool r = client.connect();
+  CHECK(r);
+  auto result = client.call<std::string>("delay_echo", "test_delay_echo");
+  CHECK_EQ(result, "test_delay_echo");
+}
+TEST_CASE("test_server_duplicate_registration_key") {
+  rpc_server server(9000, std::thread::hardware_concurrency());
+  server.register_handler("delay_echo", delay_echo);
+  try {
+    server.register_handler("delay_echo", delay_echo);
+  } catch (const std::exception &e) {
+    string_view ew{e.what()};
+    std::cerr << ew << '\n';
+    CHECK_EQ(ew, "duplicate registration key !");
+  }
+
+  server.async_run();
+  std::this_thread::sleep_for(std::chrono::milliseconds(200));
+
   rpc_client client("127.0.0.1", 9000);
   bool r = client.connect();
   CHECK(r);