meta: Use system libraries to compile0.5

Also: try to make pqxx not use local socket for connections
(unsuccessful)

Change-Id: I351fe1a405a7c204e1276a90da75ab3d32f51bdc

2 files changed, 6 insertions, 24 deletions

diff --git a/src/bot.cpp b/src/bot.cpp
index b1d530c..8c3a84c 100644
--- a/src/bot.cpp
+++ b/src/bot.cpp
@@ -24,7 +24,10 @@ Bot::Bot(bool devel, dpp::cluster* cluster, char prefix, json &cfg) {
 
     std::string token = cfg.value("token", "bad-token");
 
-	this->conn = db::connect(cfg["postgres"]["host"], cfg["postgres"]["user"], cfg["postgres"]["pass"], cfg["postgres"]["database"], cfg["postgres"]["port"]);
+	this->core->log(dpp::ll_debug, "Attempting DB connection");
+
+
+	this->conn = db::connect(cfg.value("postgres", "postgres://localhost/142bot"));
 
 	run_database_migrations();
 
diff --git a/src/db.cpp b/src/db.cpp
index 120c9d4..038c06d 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -35,32 +35,11 @@ namespace db {
     /**
      * Connects to a postgres database, returns false if error
      **/
-    pqxx::connection connect(const std::string &host, const std::string &user, const std::string &pass, const std::string &db, int port) {
+    pqxx::connection connect(const std::string cn_s) {
         std::lock_guard<std::mutex> db_lock(db_mutex);
 
-        
-        std::string cn_s = "postgresql://";
-
-        if (!user.empty()) {
-            cn_s = cn_s + user;
-        }
-        if (!pass.empty() && !user.empty()) {
-            cn_s = cn_s + ":" + pass;
-        }
 
-        if ((!user.empty() || !pass.empty())) {
-            cn_s = cn_s + "@";
-        }
-
-        if (!host.empty()) {
-            cn_s = cn_s + "localhost";
-        }
-        if (port != 0 && !host.empty()) {
-            cn_s = cn_s + ":" + std::to_string(port);
-        }
-        if (!db.empty()) {
-            cn_s = cn_s + "/" + db;
-        } 
+        cout << cn_s << endl;
 
         sentry_value_t crumb = sentry_value_new_breadcrumb("default", "Started Database Connection");
         sentry_value_set_by_key(crumb, "level", sentry_value_new_string("db"));