summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Goodliffe <dan.goodliffe@octal.co.uk>2026-05-01 17:13:29 +0100
committerDan Goodliffe <dan.goodliffe@octal.co.uk>2026-05-01 17:13:29 +0100
commit5c0206f48dc7f90009629d0a74bdc1dd6b4f67ea (patch)
tree4063eec8c51c26151129da558b214ac213d2f7c0 /src
parent0e768a00fab74818533458b5b40c84556b2137e0 (diff)
downloadwebstat-5c0206f48dc7f90009629d0a74bdc1dd6b4f67ea.tar.bz2
webstat-5c0206f48dc7f90009629d0a74bdc1dd6b4f67ea.tar.xz
webstat-5c0206f48dc7f90009629d0a74bdc1dd6b4f67ea.zip
Rename jobIngestParkedLines to jobReadParkedLines
Actual ingest is performed by the main process, jobReadParkedLines just reads the park file and adds it to the queue.
Diffstat (limited to 'src')
-rw-r--r--src/ingestor.cpp12
-rw-r--r--src/ingestor.hpp6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ingestor.cpp b/src/ingestor.cpp
index 7fd64cd..e2c315c 100644
--- a/src/ingestor.cpp
+++ b/src/ingestor.cpp
@@ -116,7 +116,7 @@ namespace WebStat {
Ingestor::Ingestor(const utsname & host, DB::ConnectionPoolPtr dbpl, IngestorSettings givenSettings) :
settings {std::move(givenSettings)}, dbpool {std::move(dbpl)},
- ingestParkedLines {&Ingestor::jobIngestParkedLines}, purgeOldLogs {&Ingestor::jobPurgeOldLogs},
+ ingestParkedLines {&Ingestor::jobReadParkedLines}, purgeOldLogs {&Ingestor::jobPurgeOldLogs},
hostnameId {insert(dbpool->get(), SQL::HOST_UPSERT, SQL::HOST_UPSERT_OPTS, host.nodename, host.sysname,
host.release, host.version, host.machine, host.domainname)},
curl {curl_multi_init()}, mainThread {std::this_thread::get_id()}
@@ -410,12 +410,12 @@ namespace WebStat {
}
Ingestor::Job::Result
- Ingestor::jobIngestParkedLines()
+ Ingestor::jobReadParkedLines()
{
for (auto pathIter = std::filesystem::directory_iterator {settings.fallbackDir};
pathIter != std::filesystem::directory_iterator {}; ++pathIter) {
if (scn::scan<std::string>(pathIter->path().filename().string(), "parked-{:[a-zA-Z0-9]}.log")) {
- return [lines = jobIngestParkedLines(pathIter->path()), this, path = pathIter->path()]() mutable {
+ return [lines = jobReadParkedLines(pathIter->path()), this, path = pathIter->path()]() mutable {
auto count = lines.size();
queuedLines.append_range(std::move(lines));
unlink(path.c_str());
@@ -429,12 +429,12 @@ namespace WebStat {
}
Ingestor::LineBatch
- Ingestor::jobIngestParkedLines(const std::filesystem::path & path)
+ Ingestor::jobReadParkedLines(const std::filesystem::path & path)
{
if (auto parked = FilePtr(fopen(path.c_str(), "r"))) {
if (auto count = scn::scan<size_t>(parked.get(), "{}\n")) {
try {
- return jobIngestParkedLines(parked.get(), count->value());
+ return jobReadParkedLines(parked.get(), count->value());
}
catch (...) {
auto failPath = auto {path}.replace_extension(".short");
@@ -447,7 +447,7 @@ namespace WebStat {
}
Ingestor::LineBatch
- Ingestor::jobIngestParkedLines(FILE * lines, size_t count)
+ Ingestor::jobReadParkedLines(FILE * lines, size_t count)
{
LineBatch parkedLines;
parkedLines.reserve(count);
diff --git a/src/ingestor.hpp b/src/ingestor.hpp
index 4373f40..d989ecd 100644
--- a/src/ingestor.hpp
+++ b/src/ingestor.hpp
@@ -72,7 +72,7 @@ namespace WebStat {
std::optional<std::future<Result>> currentRun;
};
- Job::Result jobIngestParkedLines();
+ Job::Result jobReadParkedLines();
Job::Result jobPurgeOldLogs();
template<typename... T> void storeLogLine(DB::Connection *, const std::tuple<T...> &) const;
@@ -114,8 +114,8 @@ namespace WebStat {
void finalizeJob(Job &, minutes freq, Job::LastRunTime::clock::time_point now);
void finishAllJobs();
- LineBatch jobIngestParkedLines(const std::filesystem::path &);
- LineBatch jobIngestParkedLines(FILE *, size_t count);
+ LineBatch jobReadParkedLines(const std::filesystem::path &);
+ LineBatch jobReadParkedLines(FILE *, size_t count);
static void sigtermHandler(int);
void terminate(int);