From ec0ca59539c6314acca0419d13fd4e99a323eda1 Mon Sep 17 00:00:00 2001
From: Boris Rybalkin <ribalkin@gmail.com>
Date: Tue, 28 Feb 2023 13:00:37 +0000
Subject: [PATCH] fix socket remove

---
 setup/base/base.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/base/base.go b/setup/base/base.go
index 27fcb4c99..dfe48ff3c 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -20,9 +20,11 @@ import (
 	"database/sql"
 	"embed"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"html/template"
 	"io"
+	"io/fs"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -435,8 +437,8 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 				}
 			} else {
 				if externalHTTPAddr.IsUnixSocket() {
-					err := os.RemoveAll(externalHTTPAddr.Address)
-					if err != nil {
+					err := os.Remove(externalHTTPAddr.Address)
+					if err != nil && !errors.Is(err, fs.ErrNotExist) {
 						logrus.WithError(err).Fatal("failed to remove existing unix socket")
 					}
 					listener, err := net.Listen(externalHTTPAddr.Network(), externalHTTPAddr.Address)