From 0f6eb9a6a6bd2c50620756074e4b21a415bf9773 Mon Sep 17 00:00:00 2001 From: Wilco Baan Hofman Date: Tue, 1 Feb 2022 00:08:13 +0100 Subject: [PATCH] Revert threadsafe mysql connection. It does not appear to work --- database.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/database.c b/database.c index 4083a9e..e99cb2d 100644 --- a/database.c +++ b/database.c @@ -128,7 +128,6 @@ STATUS database_init(void) { configuration *conf = get_modifiable_conf(); GError *error = NULL; - dbi_inst dbi_instance = 0; conf->database_host = g_key_file_get_string(conf->keyfile, "database", "host", &error); @@ -168,8 +167,14 @@ STATUS database_init(void) DEBUG(1, "Setting properties to %s database %s at %s as user %s", conf->database_driver, conf->database_name, conf->database_host, conf->database_username); - dbi_initialize_r(NULL, &dbi_instance); - conn = dbi_conn_new_r(conf->database_driver, &dbi_instance); + if (dbi_initialize(NULL) < 1) { + DEBUG(0, "Failed to init database instance."); + } + conn = dbi_conn_new(conf->database_driver); + if (conn == NULL) { + DEBUG(0, "Failed to open database."); + } + dbi_conn_set_option(conn, "host", conf->database_host); dbi_conn_set_option(conn, "username", conf->database_username); dbi_conn_set_option(conn, "password", conf->database_password);