Pass a DB connection to Ingestor

4 files changed, 15 insertions, 3 deletions

diff --git a/src/Jamfile.jam b/src/Jamfile.jam
index f63ff81..adbdc02 100644
--- a/src/Jamfile.jam
+++ b/src/Jamfile.jam
@@ -1,9 +1,13 @@
 lib webstat : ingestor.cpp logTypes.cpp :
 	<include>.
 	<library>..//adhocutil
+	<library>..//dbppcore
 	<library>../thirdparty//scn
 	<library>..//z
 	: :
 	<include>.
 	;
-exe webstat_logger : webstat_logger_main.cpp : <library>webstat ;
+exe webstat_logger : webstat_logger_main.cpp :
+	<library>webstat
+	<library>..//dbpp-postgresql
+;
diff --git a/src/ingestor.cpp b/src/ingestor.cpp
index 17310c2..d5dd4e2 100644
--- a/src/ingestor.cpp
+++ b/src/ingestor.cpp
@@ -38,6 +38,8 @@ namespace WebStat {
 		}
 	}
 
+	Ingestor::Ingestor(DB::ConnectionPtr dbconn) : dbconn {std::move(dbconn)} { }
+
 	Ingestor::ScanResult
 	Ingestor::scanLogLine(std::string_view input)
 	{
diff --git a/src/ingestor.hpp b/src/ingestor.hpp
index 9ae8130..8450e4f 100644
--- a/src/ingestor.hpp
+++ b/src/ingestor.hpp
@@ -2,13 +2,14 @@
 
 #include "logTypes.hpp"
 #include <c++11Helpers.h>
+#include <connection_fwd.h>
 #include <cstdio>
 #include <scn/scan.h>
 
 namespace WebStat {
 	class Ingestor {
 	public:
-		Ingestor() = default;
+		Ingestor(DB::ConnectionPtr dbconn);
 
 		virtual ~Ingestor() = default;
 		SPECIAL_MEMBERS_DEFAULT_MOVE_NO_COPY(Ingestor);
@@ -26,5 +27,8 @@ namespace WebStat {
 		size_t linesRead = 0;
 		size_t linesParsed = 0;
 		size_t linesDiscarded = 0;
+
+	private:
+		DB::ConnectionPtr dbconn;
 	};
 }
diff --git a/src/webstat_logger_main.cpp b/src/webstat_logger_main.cpp
index c4d31d6..8f2d45a 100644
--- a/src/webstat_logger_main.cpp
+++ b/src/webstat_logger_main.cpp
@@ -1,7 +1,9 @@
 #include "ingestor.hpp"
+#include <pq-connection.h>
 
 int
 main(int, char **)
 {
-	WebStat::Ingestor {}.ingestLog(stdin);
+	auto dbconn = std::make_shared<PQ::Connection>("dbname=webstat user=webstat");
+	WebStat::Ingestor {dbconn}.ingestLog(stdin);
 }