Changeset 19 in code for trunk/partage.go

Timestamp:

Oct 18, 2021, 3:41:56 PM (4 years ago)

Author:

dev

Message:

Improve error handling for writefile()

File:

• trunk/partage.go (modified) (5 diffs)

trunk/partage.go

@@ -45 +45 @@
 }
 
-func writefile(f *os.File, s io.ReadCloser, contentlength int64) int64 {
+func writefile(f *os.File, s io.ReadCloser, contentlength int64) error {
         buffer := make([]byte, 4096)
         eof := false
@@ -55 +55 @@
                 n, err := s.Read(buffer)
                 if err != nil && err != io.EOF {
-                        fmt.Println(err)
-                        return -1
+                        return err
                 } else if err == io.EOF {
                         eof = true
@@ -70 +69 @@
                 _, err = f.Write(buffer[:r])
                 if err != nil {
-                        fmt.Println(err)
+                        return err
                 }
                 sz += r
         }
 
-        return sz
+        return nil
 }
 
@@ -106 +105 @@
         defer f.Close()
 
-        if writefile(f, r.Body, r.ContentLength) < 0 {
+        if err = writefile(f, r.Body, r.ContentLength); err != nil {
                 w.WriteHeader(http.StatusInternalServerError)
+                defer os.Remove(tmp.Name())
                 return
         }
@@ -142 +142 @@
                 defer f.Close()
 
-                if writefile(f, post, h.Size) < 0 {
+                if err = writefile(f, post, h.Size); err != nil {
                         w.WriteHeader(http.StatusInternalServerError)
+                        defer os.Remove(tmp.Name())
                         return
                 }