From 8166d1701686588630cae9b44310790d084f8fd7 Mon Sep 17 00:00:00 2001 From: Michael Marley Date: Tue, 16 Sep 2014 19:29:12 -0400 Subject: [PATCH] Quit on database connection failure Previously, if a Quasselcore was configured to use PostgreSQL but the PostgreSQL connection failed on startup, it would come up unconfigured with SQLite. This patch makes the Quasselcore quit with a fatal error instead. --- src/core/core.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index 008c5b0a..7068f84e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -380,13 +380,10 @@ bool Core::initStorage(const QString &backend, const QVariantMap &settings, bool return false; // trigger setup process if (storage->setup(settings)) return initStorage(backend, settings, false); - // if setup wasn't successfull we mark the backend as unavailable + // if initialization wasn't successful, we quit to keep from coming up unconfigured case Storage::NotAvailable: - qCritical() << "Selected storage backend is not available:" << backend; - storage->deleteLater(); - _storageBackends.remove(backend); - storage = 0; - return false; + qCritical() << "FATAL: Selected storage backend is not available:" << backend; + exit(EXIT_FAILURE); case Storage::IsReady: // delete all other backends _storageBackends.remove(backend); -- 2.20.1