From: Han Xu <keepsimple@gmail.com>
To: ~radicle-link/dev@lists.sr.ht
Cc: Han Xu <keepsimple@gmail.com>
Subject: [PATCH radicle-link v2 1/2] unlink unix socket before bind
Date: Tue, 16 Aug 2022 06:54:05 -0700
Message-Id: <20220816135406.62129-2-keepsimple@gmail.com>
In-Reply-To: <20220816135406.62129-1-keepsimple@gmail.com>
References: <20220812033750.4409-1-keepsimple@gmail.com>
 <20220816135406.62129-1-keepsimple@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

---
 cli/linkd-lib/src/api/sockets.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cli/linkd-lib/src/api/sockets.rs b/cli/linkd-lib/src/api/sockets.rs
index 050c1dd0..6ea13315 100644
--- a/cli/linkd-lib/src/api/sockets.rs
+++ b/cli/linkd-lib/src/api/sockets.rs
@@ -132,8 +132,19 @@ fn env_sockets() -> Result<SyncSockets, Error> {
 fn profile_sockets(profile: &Profile, peer_id: &PeerId) -> Result<SyncSockets, Error> {
     let rpc_socket_path = profile.paths().rpc_socket(peer_id);
     let events_socket_path = profile.paths().events_socket(peer_id);
-    let rpc = StdUnixListener::bind(rpc_socket_path.as_path())?;
-    let events = StdUnixListener::bind(events_socket_path.as_path())?;
+
+    // UNIX socket needs to be unlinked if already exists.
+    nix::unistd::unlink(&rpc_socket_path).ok();
+    let rpc = StdUnixListener::bind(rpc_socket_path.as_path()).map_err(|e| {
+        tracing::error!("bind rpc_socket_path: {:?} error: {}", &rpc_socket_path, &e);
+        e
+    })?;
+    nix::unistd::unlink(&events_socket_path).ok();
+    let events = StdUnixListener::bind(events_socket_path.as_path()).map_err(|e| {
+        tracing::error!("bind events_socket_path: {:?} error: {}", &events_socket_path, &e);
+        e
+    })?;
+
     Ok(SyncSockets {
         rpc,
         events,
-- 
2.32.0 (Apple Git-132)