Do not ignore errored feeds when a user refresh feeds manually

This commit is contained in:
Frédéric Guillot 2018-06-26 22:55:44 -07:00
parent 45d7105ed1
commit dd78fb4340
1 changed files with 5 additions and 2 deletions

View File

@ -30,14 +30,17 @@ func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) {
// NewUserBatch returns a serie of jobs but only for a given user. // NewUserBatch returns a serie of jobs but only for a given user.
func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) { func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:GetUserJobs] batchSize=%d, userID=%d", batchSize, userID)) defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:GetUserJobs] batchSize=%d, userID=%d", batchSize, userID))
// We do not take the error counter into consideration when the given
// user refresh manually all his feeds to force a refresh.
query := ` query := `
SELECT SELECT
id, user_id id, user_id
FROM feeds FROM feeds
WHERE user_id=$1 AND parsing_error_count < $2 WHERE user_id=$1
ORDER BY checked_at ASC LIMIT %d` ORDER BY checked_at ASC LIMIT %d`
return s.fetchBatchRows(fmt.Sprintf(query, batchSize), userID, maxParsingError) return s.fetchBatchRows(fmt.Sprintf(query, batchSize), userID)
} }
func (s *Storage) fetchBatchRows(query string, args ...interface{}) (jobs model.JobList, err error) { func (s *Storage) fetchBatchRows(query string, args ...interface{}) (jobs model.JobList, err error) {