Home

horcrux @main - refs - log -
-
https://git.jolheiser.com/horcrux.git
Split your source across forges
tree log patch
fix sigterm trap and add git command output for debugging Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQK9qW8GVAS33uhtYfhlvv2qJBvMIQ/X3gC3IPFe0nwGVTn3AN26VAEBixZTMsNb5uK 8TyoPs/D8K6nObjSUyLwU= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
4 days ago
1 changed files, 6 additions(+), 4 deletions(-)
main.go
M main.gomain.go
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
diff --git a/main.go b/main.go
index ac24291c33a27c956c576a00144dc08beeacc387..94f407479e71b9b506582deac1cf38e90ac3c05d 100644
--- a/main.go
+++ b/main.go
@@ -11,6 +11,8 @@ 	"os"
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"strings"
+	"syscall"
 	"time"
 
 	"go.jolheiser.com/cuesonnet"
@@ -94,7 +96,7 @@ 		}
 	}()
 
 	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt, os.Kill)
+	signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 	<-ch
 
 	return nil
@@ -105,9 +107,9 @@ 	return func(dir string, args ...string) error {
 		cmd := exec.Command("git", args...)
 		cmd.Dir = dir
 		cmd.Env = append(os.Environ(), fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o "StrictHostKeyChecking accept-new" -i %s`, key))
-		// cmd.Stdout = os.Stdout
-		// cmd.Stderr = os.Stderr
-		return cmd.Run()
+		out, err := cmd.Output()
+		slog.Debug("git command", slog.String("args", strings.Join(args, " ")), slog.String("output", string(out)))
+		return err
 	}
 }