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

handle pushpress errors

Browse Source
This commit is contained in:
Athou
2013-05-23 06:55:17 +02:00
parent 44d4d3e96b
commit 7d09dc8046
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,12 +7,11 @@ import java.util.Date;
import javax.inject.Inject;
import org.apache.commons.lang.mutable.MutableBoolean;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.HttpGetter.NotModifiedException;
import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedPushInfo;
@@ -143,13 +142,6 @@ public class FeedRefreshWorker {
if (info == null) {
info = feedPushInfoService.findOrCreate(feed, hub, topic);
}
if (!StringUtils.equals(hub, info.getHub())
|| !StringUtils.equals(topic, info.getTopic())) {
info.setHub(hub);
info.setTopic(topic);
info.setFeed(feed);
info.setActive(false);
}
feed.setPushInfo(info);
}
}

22
src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.ws.rs.core.MediaType;
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
@@ -17,6 +18,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.HttpGetter;
import com.commafeed.backend.dao.FeedPushInfoDAO;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedPushInfo;
import com.commafeed.backend.services.ApplicationSettingsService;
@@ -30,6 +32,9 @@ public class SubscriptionHandler {
@Inject
ApplicationSettingsService applicationSettingsService;
@Inject
FeedPushInfoDAO feedPushInfoDAO;
public void subscribe(Feed feed) {
FeedPushInfo info = feed.getPushInfo();
String hub = info.getHub();
@@ -63,9 +68,20 @@ public class SubscriptionHandler {
int code = response.getStatusLine().getStatusCode();
if (code != 204 && code != 202 && code != 200) {
throw new Exception("Unexpected response code: " + code + " "
+ response.getStatusLine().getReasonPhrase() + " - "
+ EntityUtils.toString(response.getEntity()));
String message = EntityUtils.toString(response.getEntity());
String pushpressError = " is value is not allowed. You may only subscribe to";
if (code == 400
&& StringUtils.contains(message, pushpressError)) {
String[] tokens = message.split(" ");
info.setTopic(tokens[tokens.length - 1]);
feedPushInfoDAO.update(info);
log.debug("handled pushpress subfeed {} : {}", topic,
info.getTopic());
} else {
throw new Exception("Unexpected response code: " + code
+ " " + response.getStatusLine().getReasonPhrase()
+ " - " + message);
}
}
log.debug("subscribed to {} for {}", hub, topic);
} catch (Exception e) {