From 8f9e8fd2ea6d893fa09e4986ad6b6b2cbf8aad22 Mon Sep 17 00:00:00 2001
From: Risto Kankkunen <risto.kankkunen@iki.fi>
Date: Mon, 20 May 2013 22:14:56 +0300
Subject: [PATCH] Make subscription failures visible.

--HG--
extra : rebase_source : 9e7232b821665d9a6342c928d0b17ac3bdd9e6e7
---
 .../commafeed/frontend/rest/resources/FeedREST.java    | 10 ++++++++--
 src/main/webapp/js/controllers.js                      |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
index 68394500..3b4c9b03 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -224,9 +224,15 @@ public class FeedREST extends AbstractResourceREST {
 		FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null
 				: feedCategoryDAO.findById(Long.valueOf(req.getCategoryId()));
 		FeedInfo info = (FeedInfo) fetchFeed(url).getEntity();
-		feedSubscriptionService.subscribe(getUser(), info.getUrl(),
+		try {
+			feedSubscriptionService.subscribe(getUser(), info.getUrl(),
 				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();
 	}
 
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index b635265f..fc46eb18 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -75,8 +75,11 @@ function($scope, FeedService, CategoryService) {
 		}
 		FeedService.subscribe($scope.sub, function() {
 			CategoryService.init();
+			$scope.close();
+		}, function(data) {
+			$scope.state = 'failed';
+			$scope.sub.title = 'ERROR: ' + data.data;
 		});
-		$scope.close();
 	};
 
 	$scope.openImport = function() {