Merge pull request #1916 from Sonicadvance1/server_socket_path_override

FEXServer: Support socket path override
FEX-Emu · Aug 13, 2022 · a2f4f49 · a2f4f49
2 parents 9de25c2 + fe1f00a
commit a2f4f49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/External/FEXCore/Source/Interface/Config/Config.json.in b/External/FEXCore/Source/Interface/Config/Config.json.in
@@ -351,6 +351,13 @@
         "Desc": [
           "Loads an AOT IR cache for the loaded executable."
         ]
+      },
+      "ServerSocketPath": {
+        "Type": "str",
+        "Default": "",
+        "Desc": [
+          "Override for a FEXServer socket path. Only useful for chroots."
+        ]
       }
     }
   },

diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
@@ -101,7 +101,12 @@ namespace FEXServerClient {
   }
 
   std::string GetServerSocketFile() {
-    return fmt::format("{}/{}.FEXServer.socket", std::filesystem::temp_directory_path().string(), ::geteuid());
+    FEX_CONFIG_OPT(ServerSocketPath, SERVERSOCKETPATH);
+    if (ServerSocketPath().empty()) {
+      return fmt::format("{}/{}.FEXServer.socket", std::filesystem::temp_directory_path().string(), ::geteuid());
+    }
+
+    return ServerSocketPath;
   }
 
   int GetServerFD() {