From 548e4431479f29e91b00fbfa241f23d3ea47bc70 Mon Sep 17 00:00:00 2001 From: zkqiang Date: Wed, 14 Oct 2020 11:59:37 +0800 Subject: [PATCH] fixed close nil pointer --- backend/services/spider_handler/spider.go | 2 +- backend/utils/helpers.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/services/spider_handler/spider.go b/backend/services/spider_handler/spider.go index 389ea6cd..d0d75717 100644 --- a/backend/services/spider_handler/spider.go +++ b/backend/services/spider_handler/spider.go @@ -125,12 +125,12 @@ func (s *SpiderSync) Download() { defer session.Close() f, err := gf.OpenId(bson.ObjectIdHex(fileId)) - defer utils.Close(f) if err != nil { log.Errorf("open file id: " + fileId + ", spider id:" + spiderId + ", error: " + err.Error()) debug.PrintStack() return } + defer utils.Close(f) // 生成唯一ID randomId := uuid.NewV4() diff --git a/backend/utils/helpers.go b/backend/utils/helpers.go index e181c66c..7008c2da 100644 --- a/backend/utils/helpers.go +++ b/backend/utils/helpers.go @@ -36,8 +36,10 @@ func GetMessage(message redis.Message) *entity.NodeMessage { } func Close(c io.Closer) { - err := c.Close() - if err != nil { + if c == nil { + return + } + if err := c.Close(); err != nil { //log.WithError(err).Error("关闭资源文件失败。") } }