Also check for context cancelled

vansante · Dec 11, 2019 · 62f0ae9 · 62f0ae9
1 parent 8d1732a
commit 62f0ae9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/file.go b/file.go
@@ -89,8 +89,8 @@ func (f *file) stat() (fi FileInfo, err error) {
 
 	resp, err := f.client.Do(req)
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			f.Infof("file.stat: Context timeout for %s: %v", f.fileID, err)
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
+			f.Infof("file.stat: Context expired for %s: %v", f.fileID, err)
 		} else {
 			f.Errorf("file.stat: Error executing request for %s: %v", f.fileID, err)
 		}
@@ -128,8 +128,8 @@ func (f *file) close() (err error) {
 
 	resp, err := f.client.Do(req)
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			f.Infof("file.close: Context timeout for %s: %v", f.fileID, err)
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
+			f.Infof("file.close: Context expired for %s: %v", f.fileID, err)
 		} else {
 			f.Errorf("file.close: Error executing request for %s: %v", f.fileID, err)
 		}

diff --git a/reader.go b/reader.go
@@ -70,8 +70,8 @@ func (r *Reader) read(buf []byte, offset int64) (n int, err error) {
 
 	resp, err := r.client.Do(req)
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			r.Infof("Reader.read: Context timeout for %s: %v", r.fileID, err)
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
+			r.Infof("Reader.read: Context expired for %s: %v", r.fileID, err)
 		} else {
 			r.Errorf("Reader.read: Error executing request for %s: %v", r.fileID, err)
 		}

diff --git a/writer.go b/writer.go
@@ -70,8 +70,8 @@ func (w *Writer) write(buf []byte, offset int64) (n int, err error) {
 
 	resp, err := w.client.Do(req)
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			w.Infof("Writer.write: Context timeout for %s: %v", w.fileID, err)
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
+			w.Infof("Writer.write: Context expired for %s: %v", w.fileID, err)
 		} else {
 			w.Errorf("Writer.write: Error executing request for %s: %v", w.fileID, err)
 		}