From 78bb67fbf79bce6abed9d4e416ca1d10ed7dc12b Mon Sep 17 00:00:00 2001 From: Jason Cameron Date: Tue, 22 Apr 2025 20:31:19 -0400 Subject: fix: improve error handling and create the json encoder once #331 (#332) * fix: improve error handling for resource closing and JSON encoding in MakeChallenge * chore: update CHANGELOG with recent changes and improvements * refactor: simplify RenderIndex function and improve error handling --------- Signed-off-by: Jason Cameron --- cmd/anubis/main.go | 9 ++++++--- cmd/containerbuild/main.go | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/anubis/main.go b/cmd/anubis/main.go index 222e21f..fafd1b1 100644 --- a/cmd/anubis/main.go +++ b/cmd/anubis/main.go @@ -117,7 +117,10 @@ func setupListener(network string, address string) (net.Listener, string) { err = os.Chmod(address, os.FileMode(mode)) if err != nil { - listener.Close() + err := listener.Close() + if err != nil { + log.Printf("failed to close listener: %v", err) + } log.Fatal(fmt.Errorf("could not change socket mode: %w", err)) } } @@ -227,12 +230,12 @@ func main() { log.Fatalf("failed to parse and validate ED25519_PRIVATE_KEY_HEX: %v", err) } } else if *ed25519PrivateKeyHexFile != "" { - hex, err := os.ReadFile(*ed25519PrivateKeyHexFile) + hexData, err := os.ReadFile(*ed25519PrivateKeyHexFile) if err != nil { log.Fatalf("failed to read ED25519_PRIVATE_KEY_HEX_FILE %s: %v", *ed25519PrivateKeyHexFile, err) } - priv, err = keyFromHex(string(bytes.TrimSpace(hex))) + priv, err = keyFromHex(string(bytes.TrimSpace(hexData))) if err != nil { log.Fatalf("failed to parse and validate content of ED25519_PRIVATE_KEY_HEX_FILE: %v", err) } diff --git a/cmd/containerbuild/main.go b/cmd/containerbuild/main.go index e7dceae..3cd7514 100644 --- a/cmd/containerbuild/main.go +++ b/cmd/containerbuild/main.go @@ -131,7 +131,7 @@ func parseImageList(imageList string) ([]image, error) { } if len(result) == 0 { - return nil, fmt.Errorf("no images provided, bad flags??") + return nil, fmt.Errorf("no images provided, bad flags") } return result, nil -- cgit v1.2.3