fix: update Kill return type and add server header

Author: chenxuan520

demo/util/process_ctrl.cpp

@@ -1,4 +1,5 @@
 #include "process_ctrl.hpp"
+#include <cstdio>
 
 namespace cppapp {
 
@@ -47,9 +48,11 @@ void ProcessCtrl::EndGuard(int) {
 #endif
 }
 
-void ProcessCtrl::Kill(int pid, int signal) {
+int ProcessCtrl::Kill(int pid, int signal) {
 #ifndef _WIN32
-  kill(pid, signal);
+  return kill(pid, signal);
+#else
+  return -1;
 #endif
 }
 

demo/util/process_ctrl.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <csignal>
-#include <cstdio>
 #include <cstdlib>
 #include <functional>
 #include <sys/wait.h>
@@ -41,7 +40,7 @@ class ProcessCtrl {
    * @param pid
    * @note 1. Send a signal to the process with the specified pid.
    */
-  static void Kill(int pid, int signal = SIGINT);
+  static int Kill(int pid, int signal = SIGINT);
 
 private:
   static void EndGuard(int);

demo/web-server/config.json

@@ -7,14 +7,14 @@
 	"redirects":[
 		{
 			"route":"/hello",
-			"redirect":"https://chenxuanweb.top"
+			"redirect":"https://www.chenxuanweb.top"
+		},
+		{
+			"route":"/",
+			"redirect":"../asset/index.html"
 		}
 	],
 	"statics":[
-		{
-			"route":"/",
-			"path":"../asset/index.html"
-		},
 		{
 			"route":"/home",
 			"path":"../asset/blog-home/index.html"

demo/web-server/main.cpp

@@ -116,6 +116,11 @@ void RunWithConfig(Config &config) {
     server.set_logger(logger);
   }
 
+  // add header server for sign cppnet server
+  server.Use([](HttpContext &ctx) {
+    ctx.resp().header().Add("Server", "cppnet/" + Version::GetStr());
+  });
+
   //  write pid into file
   File::Write("./server.pid", to_string(pid));
 
@@ -145,12 +150,20 @@ int _main(ArgcDeal &args) {
         cout << "pid too small, check if error";
         exit(0);
       }
-      ProcessCtrl::Kill(pid);
+      auto kill_result = ProcessCtrl::Kill(pid);
+      if (kill_result != 0) {
+        cout << "kill " << pid << " error" << endl;
+        exit(-1);
+      }
+      cout << "kill " << pid << " stop ok" << endl;
       if (args.GetOption("stop")) {
-        cout << "kill " << pid << " stop ok" << endl;
+        // delete file
+        File::Remove("./server.pid");
+        cout << "delete pid file" << endl;
         exit(0);
+
       } else {
-        printf("wait for the port unbound...\n");
+        cout << "wait for the port unbound..." << endl;
         sleep(1);
       }
     }

src/cppnet/utils/trie.cpp

@@ -143,6 +143,11 @@ const Trie::Node *Trie::GetNode(const std::string &key) const {
       pos = 1;
     }
   }
+
+  if (pos != now->key_.size()) {
+    return nullptr;
+  }
+
   if (now->stop_ == false) {
     return nullptr;
   }

src/test/utils/trie_test.hpp

@@ -77,6 +77,11 @@ TEST(Trie, Test) {
   });
   MUST_TRUE(count == 0, "count is " << count);
 
+  trie.Search<int>("world.cdsc", [&](shared_ptr<int> data, bool last) -> bool {
+    EXPECT_EQ(last, false);
+    return true;
+  });
+
   // test
   trie.Reset();
   MUST_TRUE(trie.Get<int>("hello") == nullptr, "");
@@ -142,3 +147,17 @@ TEST(Trie, OriginApi) {
   });
   MUST_TRUE(count == 1, "error count of " << count);
 }
+
+TEST(Trie, Search) {
+  Trie trie;
+  trie.Set("/hello", std::make_shared<vector<int>>(1));
+  auto temp = trie.Get<int>("/he");
+  trie.Set("/", std::make_shared<int>(2));
+
+  MUST_TRUE(temp == nullptr, "not null");
+
+  trie.SearchNode("/hello", [&](const Trie::Node *node, bool last) -> bool {
+    DEBUG("node temp " << node->key_ << " is_end " << last);
+    return true;
+  });
+}