commit 07a06dfeefde2dbb26c98bdba280315afcb72771
from: Oliver Lowe <o@olowe.co>
date: Thu Mar 14 08:45:08 2024 UTC

cmd/apsubmit: reliably print stderr of apsend

commit - 184e4de6a4897b14d1f75b9a95ff5b7eb957f543
commit + 07a06dfeefde2dbb26c98bdba280315afcb72771
blob - 0211664170d948005bd9d409f76b56b30e1646ea
blob + c09f0c7cd5fdbf7b821dc5ca3e9f244c40cd7ae4
--- cmd/apserve/nodeinfo.go
+++ cmd/apserve/nodeinfo.go
@@ -1,4 +1,4 @@
-package apub
+package main
 
 // NodeInfo represents...
 type NodeInfo struct {
blob - 79f86165289e764f031e0ac473cb523d7918b0bb
blob + 075f3ce03072e1d27562a1b4a05b35535bcdbcbb
--- cmd/apsubmit/server.go
+++ cmd/apsubmit/server.go
@@ -70,10 +70,7 @@ func (s *Session) Data(r io.Reader) error {
 	cmd := exec.Command("apsend", args...)
 	cmd.Stdin = r
 	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err1, ok := err.(*exec.ExitError); ok {
-		return fmt.Errorf("execute mailer: %v", string(err1.Stderr))
-	} else if err != nil {
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("execute mailer: %v", err)
 	}
 	return nil