Return a callable from jobs

Allows safely running finalisation code in the main thread if required.

1 files changed, 14 insertions, 13 deletions

diff --git a/src/ingestor.hpp b/src/ingestor.hpp
index c57c16a..4882b7d 100644
--- a/src/ingestor.hpp
+++ b/src/ingestor.hpp
@@ -60,8 +60,20 @@ namespace WebStat {
 		std::expected<std::filesystem::path, int> parkQueuedLogLines();
 		void runJobsAsNeeded();
 
-		unsigned int jobIngestParkedLines();
-		unsigned int jobPurgeOldLogs();
+		struct Job {
+			using LastRunTime = std::chrono::system_clock::time_point;
+			using Result = std::function<unsigned int()>;
+			using Impl = Result (Ingestor::*)();
+
+			explicit Job(Impl jobImpl) : impl(jobImpl) { }
+
+			const Impl impl;
+			LastRunTime lastRun {LastRunTime::clock::now()};
+			std::optional<std::future<Result>> currentRun;
+		};
+
+		Job::Result jobIngestParkedLines();
+		Job::Result jobPurgeOldLogs();
 
 		template<typename... T> void storeLogLine(DB::Connection *, const std::tuple<T...> &) const;
 
@@ -86,17 +98,6 @@ namespace WebStat {
 
 		bool terminated = false;
 
-		struct Job {
-			using LastRunTime = std::chrono::system_clock::time_point;
-			using Impl = unsigned int (Ingestor::*)();
-
-			explicit Job(Impl jobImpl) : impl(jobImpl) { }
-
-			const Impl impl;
-			LastRunTime lastRun {LastRunTime::clock::now()};
-			std::optional<std::future<unsigned int>> currentRun;
-		};
-
 		Job::LastRunTime lastCheckedJobs {Job::LastRunTime::clock::now()};
 		Job ingestParkedLines;
 		Job purgeOldLogs;