diff options
author | Erik Dubbelboer <erik@dubbelboer.com> | 2021-12-13 16:41:34 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-13 09:41:34 +0100 |
commit | e9db537178708982f64736dbdedfddd2a168d395 (patch) | |
tree | 705174cc0a2f0dd156dc98b578f14b7616608eba /fs.go | |
parent | Fix bad request trailer panic (diff) | |
download | fasthttp-e9db537178708982f64736dbdedfddd2a168d395.tar.gz fasthttp-e9db537178708982f64736dbdedfddd2a168d395.tar.bz2 fasthttp-e9db537178708982f64736dbdedfddd2a168d395.zip |
Use %w to wrap errors (#1175)
Diffstat (limited to 'fs.go')
-rw-r--r-- | fs.go | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -524,7 +524,7 @@ func (ff *fsFile) bigFileReader() (io.Reader, error) { f, err := os.Open(ff.f.Name()) if err != nil { - return nil, fmt.Errorf("cannot open already opened file: %s", err) + return nil, fmt.Errorf("cannot open already opened file: %w", err) } return &bigFileReader{ f: f, @@ -981,7 +981,7 @@ func (h *fsHandler) openIndexFile(ctx *RequestCtx, dirPath string, mustCompress return ff, nil } if !os.IsNotExist(err) { - return nil, fmt.Errorf("cannot open file %q: %s", indexFilePath, err) + return nil, fmt.Errorf("cannot open file %q: %w", indexFilePath, err) } } @@ -1100,7 +1100,7 @@ func (h *fsHandler) compressAndOpenFSFile(filePath string, fileEncoding string) fileInfo, err := f.Stat() if err != nil { f.Close() - return nil, fmt.Errorf("cannot obtain info for file %q: %s", filePath, err) + return nil, fmt.Errorf("cannot obtain info for file %q: %w", filePath, err) } if fileInfo.IsDir() { @@ -1146,7 +1146,7 @@ func (h *fsHandler) compressFileNolock(f *os.File, fileInfo os.FileInfo, filePat if err != nil { f.Close() if !os.IsPermission(err) { - return nil, fmt.Errorf("cannot create temporary file %q: %s", tmpFilePath, err) + return nil, fmt.Errorf("cannot create temporary file %q: %w", tmpFilePath, err) } return nil, errNoCreatePermission } @@ -1168,14 +1168,14 @@ func (h *fsHandler) compressFileNolock(f *os.File, fileInfo os.FileInfo, filePat zf.Close() f.Close() if err != nil { - return nil, fmt.Errorf("error when compressing file %q to %q: %s", filePath, tmpFilePath, err) + return nil, fmt.Errorf("error when compressing file %q to %q: %w", filePath, tmpFilePath, err) } if err = os.Chtimes(tmpFilePath, time.Now(), fileInfo.ModTime()); err != nil { return nil, fmt.Errorf("cannot change modification time to %s for tmp file %q: %s", fileInfo.ModTime(), tmpFilePath, err) } if err = os.Rename(tmpFilePath, compressedFilePath); err != nil { - return nil, fmt.Errorf("cannot move compressed file from %q to %q: %s", tmpFilePath, compressedFilePath, err) + return nil, fmt.Errorf("cannot move compressed file from %q to %q: %w", tmpFilePath, compressedFilePath, err) } return h.newCompressedFSFile(compressedFilePath, fileEncoding) } @@ -1183,12 +1183,12 @@ func (h *fsHandler) compressFileNolock(f *os.File, fileInfo os.FileInfo, filePat func (h *fsHandler) newCompressedFSFile(filePath string, fileEncoding string) (*fsFile, error) { f, err := os.Open(filePath) if err != nil { - return nil, fmt.Errorf("cannot open compressed file %q: %s", filePath, err) + return nil, fmt.Errorf("cannot open compressed file %q: %w", filePath, err) } fileInfo, err := f.Stat() if err != nil { f.Close() - return nil, fmt.Errorf("cannot obtain info for compressed file %q: %s", filePath, err) + return nil, fmt.Errorf("cannot obtain info for compressed file %q: %w", filePath, err) } return h.newFSFile(f, fileInfo, true, fileEncoding) } @@ -1210,7 +1210,7 @@ func (h *fsHandler) openFSFile(filePath string, mustCompress bool, fileEncoding fileInfo, err := f.Stat() if err != nil { f.Close() - return nil, fmt.Errorf("cannot obtain info for file %q: %s", filePath, err) + return nil, fmt.Errorf("cannot obtain info for file %q: %w", filePath, err) } if fileInfo.IsDir() { @@ -1226,7 +1226,7 @@ func (h *fsHandler) openFSFile(filePath string, mustCompress bool, fileEncoding fileInfoOriginal, err := os.Stat(filePathOriginal) if err != nil { f.Close() - return nil, fmt.Errorf("cannot obtain info for original file %q: %s", filePathOriginal, err) + return nil, fmt.Errorf("cannot obtain info for original file %q: %w", filePathOriginal, err) } // Only re-create the compressed file if there was more than a second between the mod times. @@ -1257,7 +1257,7 @@ func (h *fsHandler) newFSFile(f *os.File, fileInfo os.FileInfo, compressed bool, if len(contentType) == 0 { data, err := readFileHeader(f, compressed, fileEncoding) if err != nil { - return nil, fmt.Errorf("cannot read header of the file %q: %s", f.Name(), err) + return nil, fmt.Errorf("cannot read header of the file %q: %w", f.Name(), err) } contentType = http.DetectContentType(data) } |