Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure the feed was not in error before using its last disabled date

Browse Source
This commit is contained in:
Athou
2013-06-06 12:20:20 +02:00
parent 52e31959f5
commit 6bce9eb8ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -109,15 +109,13 @@ public class FeedRefreshWorker {
} catch (NotModifiedException e) { } catch (NotModifiedException e) {
log.debug("Feed not modified (304) : " + feed.getUrl()); log.debug("Feed not modified (304) : " + feed.getUrl());
feed.setErrorCount(0);
feed.setMessage(null);
Date disabledUntil = null; Date disabledUntil = null;
if (applicationSettingsService.get().isHeavyLoad()) { if (applicationSettingsService.get().isHeavyLoad()) {
Date lastUpdateSuccess = feed.getLastUpdateSuccess(); Date lastUpdateSuccess = feed.getLastUpdateSuccess();
Date lastDisabledUntil = feed.getDisabledUntil(); Date lastDisabledUntil = feed.getDisabledUntil();
if (lastUpdateSuccess != null && lastDisabledUntil != null if (feed.getErrorCount() == 0 && lastUpdateSuccess != null
&& lastDisabledUntil != null
&& lastUpdateSuccess.before(lastDisabledUntil)) { && lastUpdateSuccess.before(lastDisabledUntil)) {
long millis = now.getTime() + lastDisabledUntil.getTime() long millis = now.getTime() + lastDisabledUntil.getTime()
- lastUpdateSuccess.getTime(); - lastUpdateSuccess.getTime();
@@ -134,6 +132,8 @@ public class FeedRefreshWorker {
feedEntries); feedEntries);
} }
} }
feed.setErrorCount(0);
feed.setMessage(null);
feed.setDisabledUntil(disabledUntil); feed.setDisabledUntil(disabledUntil);
taskGiver.giveBack(feed); taskGiver.giveBack(feed);