From 87f00265730638d388a588db7d920f2a17fb398a Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Wed, 21 Jul 2021 11:10:21 +0300
Subject: [PATCH] Updated resource error handling

---
 engine/resources.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engine/resources.go b/engine/resources.go
index 34bb9a315..f2098edf1 100644
--- a/engine/resources.go
+++ b/engine/resources.go
@@ -546,7 +546,7 @@ func (rS *ResourceService) processThresholds(rs Resources, opts map[string]inter
 			},
 		}
 		var tIDs []string
-		if err = rS.connMgr.Call(rS.cgrcfg.ResourceSCfg().ThresholdSConns, nil,
+		if err := rS.connMgr.Call(rS.cgrcfg.ResourceSCfg().ThresholdSConns, nil,
 			utils.ThresholdSv1ProcessEvent, thEv, &tIDs); err != nil &&
 			err.Error() != utils.ErrNotFound.Error() {
 			utils.Logger.Warning(
@@ -622,7 +622,8 @@ func (rS *ResourceService) matchingResourcesForEvent(tnt string, ev *utils.CGREv
 			rPrf.unlock()
 			continue
 		}
-		if pass, err := rS.filterS.Pass(tnt, rPrf.FilterIDs,
+		var pass bool
+		if pass, err = rS.filterS.Pass(tnt, rPrf.FilterIDs,
 			evNm); err != nil {
 			rPrf.unlock()
 			rs.unlock()
@@ -634,8 +635,8 @@ func (rS *ResourceService) matchingResourcesForEvent(tnt string, ev *utils.CGREv
 		lkID := guardian.Guardian.GuardIDs(utils.EmptyString,
 			config.CgrConfig().GeneralCfg().LockingTimeout,
 			resourceLockKey(rPrf.Tenant, rPrf.ID))
-		r, err := rS.dm.GetResource(rPrf.Tenant, rPrf.ID, true, true, "")
-		if err != nil {
+		var r *Resource
+		if r, err = rS.dm.GetResource(rPrf.Tenant, rPrf.ID, true, true, ""); err != nil {
 			guardian.Guardian.UnguardIDs(lkID)
 			rPrf.unlock()
 			rs.unlock()