Skip to content

Commit

Permalink
Merge branch 'master' into feat.onboard.bingads.offline.conversions
Browse files Browse the repository at this point in the history
  • Loading branch information
anantjain45823 authored May 20, 2024
2 parents 1284dc0 + 5090a8d commit 9556f34
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func (b *MarketoBulkUploader) Poll(pollInput common.AsyncPoll) common.PollStatus
return common.PollStatusResponse{
StatusCode: transformerConnectionStatus,
HasFailed: true,
Error: string(bodyBytes),
}
}
var asyncResponse common.PollStatusResponse
Expand Down
2 changes: 1 addition & 1 deletion router/batchrouter/handle_async.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (brt *Handle) updatePollStatusToDB(
brt.asyncAbortedJobCount.Count(len(statusList))
} else {
var abortedJobsList []*jobsdb.JobT
statusList, abortedJobsList, jobIDConnectionDetailsMap = brt.prepareJobStatusList(importingList, jobsdb.JobStatusT{JobState: jobsdb.Failed.State, ErrorResponse: misc.UpdateJSONWithNewKeyVal(routerutils.EmptyPayload, "error", pollResp.Error)}, sourceID, destinationID)
statusList, abortedJobsList, jobIDConnectionDetailsMap = brt.prepareJobStatusList(importingList, jobsdb.JobStatusT{JobState: jobsdb.Failed.State, ErrorCode: strconv.Itoa(pollResp.StatusCode), ErrorResponse: misc.UpdateJSONWithNewKeyVal(routerutils.EmptyPayload, "error", pollResp.Error)}, sourceID, destinationID)
if err := brt.updateJobStatuses(ctx, destinationID, importingList, abortedJobsList, statusList); err != nil {
brt.logger.Errorf("[Batch Router] Failed to update job status for Dest Type %v with error %v", brt.destType, err)
return statusList, err
Expand Down

0 comments on commit 9556f34

Please sign in to comment.