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

display backlog in metrics

Browse Source
This commit is contained in:
Athou
2013-05-24 12:42:18 +02:00
parent f5951f178c
commit 5b847d1ba9
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -23,10 +23,7 @@ import com.uaihebert.model.EasyCriteria;
@Stateless @Stateless
public class FeedDAO extends GenericDAO<Feed> { public class FeedDAO extends GenericDAO<Feed> {
public List<Feed> findNextUpdatable(int count) { private Predicate[] getUpdatablePredicates(Root<Feed> root) {
CriteriaQuery<Feed> query = builder.createQuery(getType());
Root<Feed> root = query.from(getType());
Date now = Calendar.getInstance().getTime(); Date now = Calendar.getInstance().getTime();
Predicate hasSubscriptions = builder.isNotEmpty(root Predicate hasSubscriptions = builder.isNotEmpty(root
@@ -41,9 +38,27 @@ public class FeedDAO extends GenericDAO<Feed> {
Predicate disabledDateIsInPast = builder.lessThan( Predicate disabledDateIsInPast = builder.lessThan(
root.get(Feed_.disabledUntil), now); root.get(Feed_.disabledUntil), now);
query.where(hasSubscriptions, return new Predicate[] { hasSubscriptions,
builder.or(neverUpdated, updatedBeforeThreshold), builder.or(neverUpdated, updatedBeforeThreshold),
builder.or(disabledDateIsNull, disabledDateIsInPast)); builder.or(disabledDateIsNull, disabledDateIsInPast) };
}
public Long getUpdatableCount() {
CriteriaQuery<Long> query = builder.createQuery(Long.class);
Root<Feed> root = query.from(getType());
query.select(builder.count(root));
query.where(getUpdatablePredicates(root));
TypedQuery<Long> q = em.createQuery(query);
return q.getSingleResult();
}
public List<Feed> findNextUpdatable(int count) {
CriteriaQuery<Feed> query = builder.createQuery(getType());
Root<Feed> root = query.from(getType());
query.where(getUpdatablePredicates(root));
query.orderBy(builder.asc(root.get(Feed_.lastUpdated))); query.orderBy(builder.asc(root.get(Feed_.lastUpdated)));
TypedQuery<Feed> q = em.createQuery(query); TypedQuery<Feed> q = em.createQuery(query);

6
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -12,7 +12,6 @@ import javax.ws.rs.core.Response.Status;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.MetricsBean.Metric;
import com.commafeed.backend.StartupBean; import com.commafeed.backend.StartupBean;
import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
@@ -177,9 +176,10 @@ public class AdminREST extends AbstractResourceREST {
@Path("/metrics") @Path("/metrics")
@GET @GET
public Response getMetrics() { public Response getMetrics() {
Map<String, Metric> map = ImmutableMap.of("lastMinute", Map<String, ? extends Object> map = ImmutableMap.of("lastMinute",
metricsBean.getLastMinute(), "lastHour", metricsBean.getLastMinute(), "lastHour",
metricsBean.getLastHour()); metricsBean.getLastHour(), "backlog",
feedDAO.getUpdatableCount());
return Response.ok(map).build(); return Response.ok(map).build();
} }
} }