From: Han Xu <keepsimple@gmail.com>
To: ~radicle-link/dev@lists.sr.ht
Cc: Han Xu <keepsimple@gmail.com>
Subject: [PATCH radicle-link v2 2/2] disable gitoxide signle handlers in linkd
Date: Tue, 16 Aug 2022 06:54:06 -0700
Message-Id: <20220816135406.62129-3-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

---
 bins/Cargo.lock                  | 1 +
 bins/linkd/Cargo.toml            | 3 +++
 bins/linkd/src/main.rs           | 2 ++
 cli/linkd-lib/src/api/sockets.rs | 1 +
 4 files changed, 7 insertions(+)

diff --git a/bins/Cargo.lock b/bins/Cargo.lock
index d5756144..7eac42de 100644
--- a/bins/Cargo.lock
+++ b/bins/Cargo.lock
@@ -2024,6 +2024,7 @@ dependencies = [
 name = "linkd"
 version = "0.1.0"
 dependencies = [
+ "git-tempfile",
  "linkd-lib",
  "tokio",
 ]
diff --git a/bins/linkd/Cargo.toml b/bins/linkd/Cargo.toml
index 8789905a..ba980af1 100644
--- a/bins/linkd/Cargo.toml
+++ b/bins/linkd/Cargo.toml
@@ -22,3 +22,6 @@ features = [ "macros", "process", "rt-multi-thread" ]
 [dependencies.linkd-lib]
 path    = "../../cli/linkd-lib"
 version = "0.1.0"
+
+[dependencies.git-tempfile]
+version = "1.0.6"
diff --git a/bins/linkd/src/main.rs b/bins/linkd/src/main.rs
index e77f6248..48efdf79 100644
--- a/bins/linkd/src/main.rs
+++ b/bins/linkd/src/main.rs
@@ -7,6 +7,8 @@ use linkd_lib::node::run;
 
 #[tokio::main]
 async fn main() {
+    // Make sure gitoxide (including git-tempfile) does not override our signal handlers.
+    git_tempfile::force_setup(git_tempfile::SignalHandlerMode::None);
     if let Err(e) = run().await {
         eprintln!("linkd failed: {:?}", e);
     }
diff --git a/cli/linkd-lib/src/api/sockets.rs b/cli/linkd-lib/src/api/sockets.rs
index 6ea13315..1e00984b 100644
--- a/cli/linkd-lib/src/api/sockets.rs
+++ b/cli/linkd-lib/src/api/sockets.rs
@@ -51,6 +51,7 @@ impl Sockets {
     /// this will remove the socket files which were created when the
     /// sockets were loaded.
     pub fn cleanup(&self) -> std::io::Result<()> {
+        tracing::info!("cleanup sockets");
         match &self.open_mode {
             // Do nothing, the file descriptors are cleaned up by the activation framework
             OpenMode::SocketActivated => {},
-- 
2.32.0 (Apple Git-132)