diff --git a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java index 0d08f0c8..e253ab07 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java @@ -35,6 +35,7 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import nl.altindag.ssl.SSLFactory; import nl.altindag.ssl.apache5.util.Apache5SslUtils; @@ -43,6 +44,7 @@ import nl.altindag.ssl.apache5.util.Apache5SslUtils; * */ @Singleton +@Slf4j public class HttpGetter { private final CloseableHttpClient client; @@ -70,8 +72,9 @@ public class HttpGetter { * if the url hasn't changed since we asked for it last time */ public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) throws IOException, NotModifiedException { - long start = System.currentTimeMillis(); + log.debug("fetching {}", url); + long start = System.currentTimeMillis(); ClassicHttpRequest request = ClassicRequestBuilder.get(url).build(); if (lastModified != null) { request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified); diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java index 5f758aa0..6e70824b 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java @@ -399,20 +399,20 @@ public class FeedREST { Preconditions.checkNotNull(req.getTitle()); Preconditions.checkNotNull(req.getUrl()); - String url = prependHttp(req.getUrl()); try { - url = fetchFeedInternal(url).getUrl(); - FeedCategory category = null; if (req.getCategoryId() != null && !CategoryREST.ALL.equals(req.getCategoryId())) { category = feedCategoryDAO.findById(Long.valueOf(req.getCategoryId())); } - FeedInfo info = fetchFeedInternal(url); + + FeedInfo info = fetchFeedInternal(prependHttp(req.getUrl())); long subscriptionId = feedSubscriptionService.subscribe(user, info.getUrl(), req.getTitle(), category); return Response.ok(subscriptionId).build(); } catch (Exception e) { - log.error("Failed to subscribe to URL {}: {}", url, e.getMessage(), e); - return Response.status(Status.SERVICE_UNAVAILABLE).entity("Failed to subscribe to URL " + url + ": " + e.getMessage()).build(); + log.error("Failed to subscribe to URL {}: {}", req.getUrl(), e.getMessage(), e); + return Response.status(Status.SERVICE_UNAVAILABLE) + .entity("Failed to subscribe to URL " + req.getUrl() + ": " + e.getMessage()) + .build(); } } @@ -423,14 +423,9 @@ public class FeedREST { @Timed public Response subscribeFromUrl(@Parameter(hidden = true) @SecurityCheck User user, @Parameter(description = "feed url", required = true) @QueryParam("url") String url) { - try { Preconditions.checkNotNull(url); - - url = prependHttp(url); - url = fetchFeedInternal(url).getUrl(); - - FeedInfo info = fetchFeedInternal(url); + FeedInfo info = fetchFeedInternal(prependHttp(url)); feedSubscriptionService.subscribe(user, info.getUrl(), info.getTitle()); } catch (Exception e) { log.info("Could not subscribe to url {} : {}", url, e.getMessage());