Skip to content

Commit 2c811d9

Browse files
committed
multipart request logging calls converted to Zap.levelW calls.
1 parent 3504d44 commit 2c811d9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

httpclient/multipartrequest.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,28 +164,28 @@ func createStreamingMultipartRequestBody(files map[string][]string, formDataFiel
164164
go func() {
165165
defer func() {
166166
if err := writer.Close(); err != nil {
167-
sugar.Error("Failed to close multipart writer", zap.Error(err))
167+
sugar.Errorw("Failed to close multipart writer", zap.Error(err))
168168
}
169169
if err := pw.Close(); err != nil {
170-
sugar.Error("Failed to close pipe writer", zap.Error(err))
170+
sugar.Errorw("Failed to close pipe writer", zap.Error(err))
171171
}
172172
}()
173173

174174
for fieldName, filePaths := range files {
175175
for _, filePath := range filePaths {
176-
sugar.Debug("Adding file part", zap.String("field_name", fieldName), zap.String("file_path", filePath))
176+
sugar.Debugw("Adding file part", zap.String("field_name", fieldName), zap.String("file_path", filePath))
177177
if err := addFilePart(writer, fieldName, filePath, fileContentTypes, formDataPartHeaders, sugar); err != nil {
178-
sugar.Error("Failed to add file part", zap.Error(err))
178+
sugar.Errorw("Failed to add file part", zap.Error(err))
179179
pw.CloseWithError(err)
180180
return
181181
}
182182
}
183183
}
184184

185185
for key, val := range formDataFields {
186-
sugar.Debug("Adding form field", zap.String("field_name", key), zap.String("field_value", val))
186+
sugar.Debugw("Adding form field", zap.String("field_name", key), zap.String("field_value", val))
187187
if err := addFormField(writer, key, val, sugar); err != nil {
188-
sugar.Error("Failed to add form field", zap.Error(err))
188+
sugar.Errorw("Failed to add form field", zap.Error(err))
189189
pw.CloseWithError(err)
190190
return
191191
}
@@ -214,7 +214,7 @@ func createStreamingMultipartRequestBody(files map[string][]string, formDataFiel
214214
func addFilePart(writer *multipart.Writer, fieldName, filePath string, fileContentTypes map[string]string, formDataPartHeaders map[string]http.Header, sugar *zap.SugaredLogger) error {
215215
file, err := os.Open(filePath)
216216
if err != nil {
217-
sugar.Error("Failed to open file", zap.String("filePath", filePath), zap.Error(err))
217+
sugar.Errorw("Failed to open file", zap.String("filePath", filePath), zap.Error(err))
218218
return err
219219
}
220220
defer file.Close()
@@ -229,7 +229,7 @@ func addFilePart(writer *multipart.Writer, fieldName, filePath string, fileConte
229229

230230
part, err := writer.CreatePart(header)
231231
if err != nil {
232-
sugar.Error("Failed to create form file part", zap.String("fieldName", fieldName), zap.Error(err))
232+
sugar.Errorw("Failed to create form file part", zap.String("fieldName", fieldName), zap.Error(err))
233233
return err
234234
}
235235

@@ -238,14 +238,14 @@ func addFilePart(writer *multipart.Writer, fieldName, filePath string, fileConte
238238

239239
fileSize, err := file.Stat()
240240
if err != nil {
241-
sugar.Error("Failed to get file info", zap.String("filePath", filePath), zap.Error(err))
241+
sugar.Errorw("Failed to get file info", zap.String("filePath", filePath), zap.Error(err))
242242
return err
243243
}
244244

245245
progressLogger := logUploadProgress(file, fileSize.Size(), sugar)
246246
uploadState := &UploadState{}
247247
if err := chunkFileUpload(file, encoder, progressLogger, uploadState, sugar); err != nil {
248-
sugar.Error("Failed to copy file content", zap.String("filePath", filePath), zap.Error(err))
248+
sugar.Errorw("Failed to copy file content", zap.String("filePath", filePath), zap.Error(err))
249249
return err
250250
}
251251

0 commit comments

Comments
 (0)