MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handle readdirent errors

Browse Source
This commit is contained in:
Matthew Penner 2020-09-24 21:48:59 -06:00
parent 897c4869de
commit 1a3ba9efca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
router/error.go
View File

@ -33,7 +33,7 @@ func TrackedError(err error) *RequestError {
// generated this server for the purposes of logging. // generated this server for the purposes of logging.
func TrackedServerError(err error, s *server.Server) *RequestError { func TrackedServerError(err error, s *server.Server) *RequestError {
return &RequestError{ return &RequestError{
Err: errors.WithStack(err), Err: err,
Uuid: uuid.Must(uuid.NewRandom()).String(), Uuid: uuid.Must(uuid.NewRandom()).String(),
Message: "", Message: "",
server: s, server: s,

2
router/router_server_files.go
View File

@ -82,7 +82,7 @@ func getServerListDirectory(c *gin.Context) {
stats, err := s.Filesystem.ListDirectory(d) stats, err := s.Filesystem.ListDirectory(d)
if err != nil { if err != nil {
if err.Error() == "readdirent: not a directory" { if e, ok := err.(*os.SyscallError); ok && e.Syscall == "readdirent" {
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{ c.AbortWithStatusJSON(http.StatusNotFound, gin.H{
"error": "The requested directory does not exist.", "error": "The requested directory does not exist.",
}) })