chore: cleanup (#1849)

* chore: cleanup * chore: spawn process --------- Co-authored-by: vansangpfiev <[email protected]>
janhq · Jan 17, 2025 · c6f86fd · c6f86fd
1 parent 193946e
commit c6f86fd
Show file tree

Hide file tree

Showing 8 changed files with 257 additions and 230 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -149,6 +149,7 @@ add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/extensions/python-engine/python_engine.cc
 
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/dylib_path_manager.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils/process/utils.cc
 
     ${CMAKE_CURRENT_SOURCE_DIR}/extensions/remote-engine/remote_engine.cc
 

diff --git a/engine/cli/CMakeLists.txt b/engine/cli/CMakeLists.txt
@@ -95,6 +95,7 @@ add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../utils/file_manager_utils.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../utils/curl_utils.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../utils/system_info_utils.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/process/utils.cc
   )
 
 target_link_libraries(${TARGET_NAME} PRIVATE CLI11::CLI11)

diff --git a/engine/cli/commands/server_start_cmd.cc b/engine/cli/commands/server_start_cmd.cc
@@ -3,6 +3,7 @@
 #include "services/engine_service.h"
 #include "utils/cortex_utils.h"
 #include "utils/file_manager_utils.h"
+#include "utils/process/utils.h"
 
 #if defined(_WIN32) || defined(_WIN64)
 #include "utils/widechar_conv.h"
@@ -103,25 +104,26 @@ bool ServerStartCmd::Exec(const std::string& host, int port,
   }
 
 #else
-  // Unix-like system-specific code to fork a child process
-  pid_t pid = fork();
+  std::vector<std::string> commands;
+  // Some engines requires to add lib search path before process being created
+  auto download_srv = std::make_shared<DownloadService>();
+  auto dylib_path_mng = std::make_shared<cortex::DylibPathManager>();
+  auto db_srv = std::make_shared<DatabaseService>();
+  EngineService(download_srv, dylib_path_mng, db_srv).RegisterEngineLibPath();
 
+  std::string p = cortex_utils::GetCurrentPath() + "/" + exe;
+  commands.push_back(p);
+  commands.push_back("--config_file_path");
+  commands.push_back(get_config_file_path());
+  commands.push_back("--data_folder_path");
+  commands.push_back(get_data_folder_path());
+  commands.push_back("--loglevel");
+  commands.push_back(log_level_);
+  auto pid = cortex::process::SpawnProcess(commands);
   if (pid < 0) {
     // Fork failed
     std::cerr << "Could not start server: " << std::endl;
     return false;
-  } else if (pid == 0) {
-    // Some engines requires to add lib search path before process being created
-    auto download_srv = std::make_shared<DownloadService>();
-    auto dylib_path_mng = std::make_shared<cortex::DylibPathManager>();
-    auto db_srv = std::make_shared<DatabaseService>();
-    EngineService(download_srv, dylib_path_mng, db_srv).RegisterEngineLibPath();
-
-    std::string p = cortex_utils::GetCurrentPath() + "/" + exe;
-    execl(p.c_str(), exe.c_str(), "--start-server", "--config_file_path",
-          get_config_file_path().c_str(), "--data_folder_path",
-          get_data_folder_path().c_str(), "--loglevel", log_level_.c_str(),
-          (char*)0);
   } else {
     // Parent process
     if (!TryConnectToServer(host, port)) {