Merge pull request #2194 from Sonicadvance1/fix_confusing_error

FEXServerClient: Disable confusing connection log
FEX-Emu · Dec 5, 2022 · cc6306a · cc6306a
2 parents 66e0d46 + f0caa81
commit cc6306a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
@@ -147,7 +147,7 @@ namespace FEXServerClient {
     return ServerFD;
   }
 
-  int ConnectToServer() {
+  int ConnectToServer(ConnectionOption ConnectionOption) {
     auto ServerSocketName = GetServerSocketName();
 
     // Create the initial unix socket
@@ -169,7 +169,9 @@ namespace FEXServerClient {
     size_t SizeOfAddr = sizeof(addr.sun_family) + SizeOfSocketString;
 
     if (connect(SocketFD, reinterpret_cast<struct sockaddr*>(&addr), SizeOfAddr) == -1) {
-      LogMan::Msg::EFmt("Couldn't connect to FEXServer socket {} {} {}", ServerSocketName, errno, strerror(errno));
+      if (ConnectionOption == ConnectionOption::Default || errno != ECONNREFUSED) {
+        LogMan::Msg::EFmt("Couldn't connect to FEXServer socket {} {} {}", ServerSocketName, errno, strerror(errno));
+      }
       close(SocketFD);
       return -1;
     }
@@ -196,7 +198,7 @@ namespace FEXServerClient {
   }
 
   int ConnectToAndStartServer(char *InterpreterPath) {
-    int ServerFD = ConnectToServer();
+    int ServerFD = ConnectToServer(ConnectionOption::NoPrintConnectionError);
     if (ServerFD == -1) {
       // Couldn't connect to the server. Start one
 
@@ -253,7 +255,7 @@ namespace FEXServerClient {
         while (poll(&PollFD, 1, -1) == -1 && errno == EINTR);
 
         for (size_t i = 0; i < 5; ++i) {
-          ServerFD = ConnectToServer();
+          ServerFD = ConnectToServer(ConnectionOption::Default);
 
           if (ServerFD != -1) {
             break;

diff --git a/Source/Common/FEXServerClient.h b/Source/Common/FEXServerClient.h
@@ -63,12 +63,16 @@ namespace FEXServerClient {
    */
   int ConnectToAndStartServer(char *InterpreterPath);
 
+  enum class ConnectionOption {
+    Default,
+    NoPrintConnectionError,
+  };
   /**
    * @brief Connect to a FEXServer instance if it exists
    *
    * @return socket FD for communicating with server
    */
-  int ConnectToServer();
+  int ConnectToServer(ConnectionOption ConnectionOption = ConnectionOption::Default);
 
   /**
    * @name Packet request functions