From 68b289f423dc91086c5056871da71cd386178985 Mon Sep 17 00:00:00 2001 From: buyuxiang <347586493@qq.com> Date: Wed, 13 Jul 2022 15:58:33 +0800 Subject: [PATCH] fix: return err when failed to make m_encoder --- hrp/internal/builtin/function.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hrp/internal/builtin/function.go b/hrp/internal/builtin/function.go index 5e182fd3..efd76e10 100644 --- a/hrp/internal/builtin/function.go +++ b/hrp/internal/builtin/function.go @@ -110,12 +110,10 @@ func (w *TFormDataWriter) writeCustomFile(formKey, formValue, formType, formFile } fPath, err := filepath.Abs(formValue) if err != nil { - log.Error().Err(err).Str("path", fPath).Msg("convert absolute path failed") return err } file, err := os.ReadFile(fPath) if err != nil { - log.Error().Err(err).Str("path", fPath).Msg("read file failed") return err } @@ -139,7 +137,7 @@ func (w *TFormDataWriter) writeCustomFile(formKey, formValue, formType, formFile return err } -func multipartEncoder(formMap map[string]interface{}) *TFormDataWriter { +func multipartEncoder(formMap map[string]interface{}) (*TFormDataWriter, error) { payload := &bytes.Buffer{} writer := multipart.NewWriter(payload) tFormWriter := &TFormDataWriter{ @@ -191,18 +189,19 @@ func multipartEncoder(formMap map[string]interface{}) *TFormDataWriter { if isFilePath { if err := tFormWriter.writeCustomFile(formKey, formValue, formType, formFileName); err != nil { log.Error().Err(err).Msgf("failed to write file: %v=@\"%v\", exit", formKey, formValue) - os.Exit(1) + return nil, err } continue } if err := tFormWriter.writeCustomField(formKey, formValue, formType, formFileName); err != nil { log.Error().Err(err).Msgf("failed to write text: %v=%v, ignore", formKey, formValue) + return nil, err } } if err := writer.Close(); err != nil { log.Error().Err(err).Msg("failed to close form-data writer") } - return tFormWriter + return tFormWriter, nil } func multipartContentType(w *TFormDataWriter) string {