replace homemade threadpool framework with rxjava

commafeed-client/src/pages/admin/MetricsPage.tsx

@@ -1,34 +1,25 @@
-import { Accordion, Box, Tabs } from "@mantine/core"
+import { Accordion, Tabs } from "@mantine/core"
 import { client } from "app/client"
 import { Loader } from "components/Loader"
-import { Gauge } from "components/metrics/Gauge"
 import { Meter } from "components/metrics/Meter"
 import { MetricAccordionItem } from "components/metrics/MetricAccordionItem"
 import { Timer } from "components/metrics/Timer"
 import { useAsync } from "react-async-hook"
 import { TbChartAreaLine, TbClock } from "react-icons/tb"
 
 const shownMeters: { [key: string]: string } = {
-    "com.commafeed.backend.feed.FeedQueues.refill": "Refresh queue refill rate",
-    "com.commafeed.backend.feed.FeedRefreshTaskGiver.feedRefreshed": "Feed refreshed",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed updated",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss",
-}
-
-const shownGauges: { [key: string]: string } = {
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-updater.active": "Feed Updater active",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-updater.pending": "Feed Updater queued",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-worker.active": "Feed Worker active",
-    "com.commafeed.backend.feed.FeedRefreshExecutor.feed-refresh-worker.pending": "Feed Worker queued",
-    "com.commafeed.backend.feed.FeedQueues.queue": "Feed Refresh queue size",
+    "com.commafeed.backend.service.FeedRefreshFlowService.refill": "Feed queue refill rate",
+    "com.commafeed.backend.feed.FeedRefreshWorker.feedFetched": "Feed fetching rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed update rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss rate",
 }
 
 export function MetricsPage() {
     const query = useAsync(() => client.admin.getMetrics(), [])
 
     if (!query.result) return <Loader />
-    const { meters, gauges, timers } = query.result.data
+    const { meters, timers } = query.result.data
     return (
         <Tabs defaultValue="stats">
             <Tabs.List>
@@ -48,15 +39,6 @@ export function MetricsPage() {
                         </MetricAccordionItem>
                     ))}
                 </Accordion>
-
-                <Box pt="xs">
-                    {Object.keys(shownGauges).map(g => (
-                        <Box key={g}>
-                            <span>{shownGauges[g]}&nbsp;</span>
-                            <Gauge gauge={gauges[g]} />
-                        </Box>
-                    ))}
-                </Box>
             </Tabs.Panel>
 
             <Tabs.Panel value="timers" pt="xs">

commafeed-server/pom.xml

@@ -301,6 +301,12 @@
 			<version>1.1.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>io.reactivex.rxjava3</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>3.1.6</version>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>

commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java

@@ -18,9 +18,6 @@
 import org.hibernate.cfg.AvailableSettings;
 
 import com.codahale.metrics.json.MetricsModule;
-import com.commafeed.backend.feed.FeedRefreshTaskGiver;
-import com.commafeed.backend.feed.FeedRefreshUpdater;
-import com.commafeed.backend.feed.FeedRefreshWorker;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -32,7 +29,8 @@
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserSettings;
-import com.commafeed.backend.service.StartupService;
+import com.commafeed.backend.service.DatabaseStartupService;
+import com.commafeed.backend.service.FeedRefreshEngine;
 import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.task.ScheduledTask;
 import com.commafeed.frontend.auth.SecurityCheckFactoryProvider;
@@ -195,12 +193,10 @@ public void run(CommaFeedConfiguration config, Environment environment) throws E
 		}
 
 		// database init/changelogs
-		environment.lifecycle().manage(injector.getInstance(StartupService.class));
+		environment.lifecycle().manage(injector.getInstance(DatabaseStartupService.class));
 
-		// background feed fetching
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshTaskGiver.class));
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshWorker.class));
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshUpdater.class));
+		// start feed fetching engine
+		environment.lifecycle().manage(injector.getInstance(FeedRefreshEngine.class));
 
 		// prevent caching index.html, so that the webapp is always up to date
 		environment.servlets()

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedAndEntries.java

@@ -0,0 +1,14 @@
+package com.commafeed.backend.feed;
+
+import java.util.List;
+
+import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedEntry;
+
+import lombok.Value;
+
+@Value
+public class FeedAndEntries {
+	Feed feed;
+	List<FeedEntry> entries;
+}