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 subscription failures visible.

Browse Source 
--HG--
extra : rebase_source : 9e7232b821665d9a6342c928d0b17ac3bdd9e6e7
This commit is contained in:
Risto Kankkunen
2013-05-20 22:14:56 +03:00
parent 9fc5cee6fe
commit 8f9e8fd2ea
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -224,9 +224,15 @@ public class FeedREST extends AbstractResourceREST {
FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null
: feedCategoryDAO.findById(Long.valueOf(req.getCategoryId())); : feedCategoryDAO.findById(Long.valueOf(req.getCategoryId()));
FeedInfo info = (FeedInfo) fetchFeed(url).getEntity(); FeedInfo info = (FeedInfo) fetchFeed(url).getEntity();
feedSubscriptionService.subscribe(getUser(), info.getUrl(), try {
feedSubscriptionService.subscribe(getUser(), info.getUrl(),
req.getTitle(), category); req.getTitle(), category);
} catch (Exception e) {
log.info("Failed to subscribe to URL {}: {}", url, e.getMessage());
return Response.status(Status.SERVICE_UNAVAILABLE).entity(
"Failed to subscribe to URL " + url + ": " + e.getMessage()
).build();
}
return Response.ok(Status.OK).build(); return Response.ok(Status.OK).build();
} }

5
src/main/webapp/js/controllers.js
View File

@@ -75,8 +75,11 @@ function($scope, FeedService, CategoryService) {
} }
FeedService.subscribe($scope.sub, function() { FeedService.subscribe($scope.sub, function() {
CategoryService.init(); CategoryService.init();
$scope.close();
}, function(data) {
$scope.state = 'failed';
$scope.sub.title = 'ERROR: ' + data.data;
}); });
$scope.close();
}; };
$scope.openImport = function() { $scope.openImport = function() {