From 93ed44c9782fb187e35d50d7ba41f85939e46b5a Mon Sep 17 00:00:00 2001 From: Bernard Xie Date: Thu, 17 Nov 2022 14:24:59 -0800 Subject: [PATCH] handle cleanup error correctly --- cmd/d2/main.go | 5 ++++- lib/png/png.go | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/d2/main.go b/cmd/d2/main.go index c09b90e46..ae4d3f421 100644 --- a/cmd/d2/main.go +++ b/cmd/d2/main.go @@ -120,7 +120,10 @@ func run(ctx context.Context, ms *xmain.State) (err error) { return err } defer func() { - err = pw.Cleanup() + cleanupErr := pw.Cleanup() + if cleanupErr != nil { + ms.Log.Error.Printf("error cleaning up playwright: %v", cleanupErr.Error()) + } }() } diff --git a/lib/png/png.go b/lib/png/png.go index 997a0dcd1..6fa4542a1 100644 --- a/lib/png/png.go +++ b/lib/png/png.go @@ -120,8 +120,8 @@ func ExportPNG(ms *xmain.State, page playwright.Page, svg []byte) (outputImage [ pngString := fmt.Sprintf("%v", pngInterface) pngPrefix := "data:image/png;base64," if !strings.HasPrefix(pngString, pngPrefix) { - if len(pngString) > 20 { - pngString = pngString[0:20] + "..." + if len(pngString) > 50 { + pngString = pngString[0:50] + "..." } return nil, fmt.Errorf("invalid PNG: %v\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", pngString) }