From 097f9add830c74c334cd66c4bb9e4c9d7347acb5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Sat, 18 Aug 2018 13:52:39 +0200
Subject: [PATCH] importer fetch(): improved error handling
---
importer/fetch.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/importer/fetch.go b/importer/fetch.go
index 6c8cde6..bee2095 100644
--- a/importer/fetch.go
+++ b/importer/fetch.go
@@ -127,6 +127,7 @@ func (job *Job) fetch() error {
var res copyResult
select {
case <-job.ctx.Done():
+ conv.Close()
err = job.ctx.Err()
job.source.done <- &JobSourceResult{Err: err}
return err
@@ -136,7 +137,7 @@ func (job *Job) fetch() error {
conv.Close()
corr, convLog, err := conv.Wait()
job.im.dbgLog.Printf("fetch(): converter returned: %f db, %v", corr, err)
- if err == nil {
+ if res.err != nil {
err = res.err
}
--
GitLab