pg/Config: new struct

Author: MaxKellermann

libcommon

@@ -140,9 +140,9 @@ WorkshopConfigParser::Partition::ParseLine(FileLineParser &line)
 	const char *word = line.ExpectWord();
 
 	if (StringIsEqual(word, "database")) {
-		config.database = line.ExpectValueAndEnd();
+		config.database.connect = line.ExpectValueAndEnd();
 	} else if (StringIsEqual(word, "database_schema")) {
-		config.database_schema = line.ExpectValueAndEnd();
+		config.database.schema = line.ExpectValueAndEnd();
 	} else if (StringIsEqual(word, "translation_server")) {
 		config.translation_socket.SetLocal(line.ExpectValueAndEnd());
 	} else if (StringIsEqual(word, "tag")) {
@@ -190,9 +190,9 @@ WorkshopConfigParser::CronPartition::ParseLine(FileLineParser &line)
 	const char *word = line.ExpectWord();
 
 	if (StringIsEqual(word, "database")) {
-		config.database = line.ExpectValueAndEnd();
+		config.database.connect = line.ExpectValueAndEnd();
 	} else if (StringIsEqual(word, "database_schema")) {
-		config.database_schema = line.ExpectValueAndEnd();
+		config.database.schema = line.ExpectValueAndEnd();
 	} else if (StringIsEqual(word, "translation_server")) {
 		config.translation_socket.SetLocal(line.ExpectValueAndEnd());
 	} else if (StringIsEqual(word, "qmqp_server")) {

src/Config.cxx

@@ -9,7 +9,7 @@
 void
 CronPartitionConfig::Check() const
 {
-	if (database.empty())
+	if (database.connect.empty())
 		throw std::runtime_error("Missing 'database' setting");
 
 	if (!translation_socket.IsDefined())

src/cron/Config.cxx

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "pg/Config.hxx"
 #include "event/Chrono.hxx"
 #include "net/AllocatedSocketAddress.hxx"
 #include "net/LocalSocketAddress.hxx"
@@ -22,7 +23,7 @@ struct CronPartitionConfig {
 	 */
 	std::string tag;
 
-	std::string database, database_schema;
+	Pg::Config database;
 
 	LocalSocketAddress translation_socket;
 

src/cron/Config.hxx

@@ -25,7 +25,7 @@ CronPartition::CronPartition(EventLoop &event_loop,
 	 ? CreateConnectDatagramSocket(config.pond_server)
 	 : UniqueSocketDescriptor()),
 	 queue(logger, event_loop, root_config.node_name.c_str(),
-		       config.database.c_str(), config.database_schema.c_str(),
+		       config.database.connect.c_str(), config.database.schema.c_str(),
 		       [this](CronJob &&job){ OnJob(std::move(job)); }),
 	 workplace(_spawn_service,
 		   email_service, config.use_qrelay, config.default_email_sender,

src/cron/Partition.cxx

@@ -9,6 +9,6 @@
 void
 WorkshopPartitionConfig::Check() const
 {
-	if (database.empty())
+	if (database.connect.empty())
 		throw std::runtime_error("Missing 'database' setting");
 }

src/workshop/Config.cxx

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "pg/Config.hxx"
 #include "net/LocalSocketAddress.hxx"
 
 #include <string>
@@ -14,7 +15,7 @@ struct WorkshopPartitionConfig {
 	 */
 	std::string name;
 
-	std::string database, database_schema;
+	Pg::Config database;
 
 	LocalSocketAddress translation_socket;
 

src/workshop/Config.hxx

@@ -28,7 +28,7 @@ WorkshopPartition::WorkshopPartition(Instance &_instance,
 			  BIND_THIS_METHOD(OnRateLimitTimer)),
 	 reap_timer(instance.GetEventLoop(), BIND_THIS_METHOD(OnReapTimer)),
 	 queue(logger, instance.GetEventLoop(), root_config.node_name.c_str(),
-	       config.database.c_str(), config.database_schema.c_str(),
+	       config.database.connect.c_str(), config.database.schema.c_str(),
 	       *this),
 	 workplace(_spawn_service, *this, logger,
 		   root_config.node_name.c_str(),