Make DB pool protected for access from unit tests

2 files changed, 3 insertions, 2 deletions

diff --git a/src/ingestor.cpp b/src/ingestor.cpp
index c54ca53..e1cc7c6 100644
--- a/src/ingestor.cpp
+++ b/src/ingestor.cpp
@@ -59,7 +59,7 @@ namespace WebStat {
 	}
 
 	Ingestor::Ingestor(const utsname & host, DB::ConnectionPoolPtr dbpl) :
-		hostnameId {crc32(host.nodename)}, dbpool {std::move(dbpl)}, curl {curl_multi_init()}
+		dbpool {std::move(dbpl)}, hostnameId {crc32(host.nodename)}, curl {curl_multi_init()}
 	{
 		auto dbconn = dbpool->get();
 		auto ins = dbconn->modify(SQL::HOST_UPSERT, SQL::HOST_UPSERT_OPTS);
diff --git a/src/ingestor.hpp b/src/ingestor.hpp
index a0dd1b9..ffdcc9a 100644
--- a/src/ingestor.hpp
+++ b/src/ingestor.hpp
@@ -34,6 +34,8 @@ namespace WebStat {
 		std::string userAgentAPI = "https://useragentstring.com";
 
 	protected:
+		DB::ConnectionPoolPtr dbpool;
+
 		size_t linesRead = 0;
 		size_t linesParsed = 0;
 		size_t linesDiscarded = 0;
@@ -48,7 +50,6 @@ namespace WebStat {
 		using CurlOperations = std::map<CURL *, std::unique_ptr<CurlOperation>>;
 		mutable std::flat_set<Crc32Value> existingEntities;
 		uint32_t hostnameId;
-		DB::ConnectionPoolPtr dbpool;
 		CurlMultiPtr curl;
 		mutable CurlOperations curlOperations;
 	};