X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=77280c3fb6be33676a61fd290b7a08cc5f02a7c1;hp=c7827934b847d2717fd6fc2c1dec9174c608d4ea;hb=7b4bac1b744a407d51f0ece67e0d531206ddad0b;hpb=029c6d402af7b00b320dd5ce48f230783a88957a diff --git a/src/core/core.cpp b/src/core/core.cpp index c7827934..77280c3f 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -131,29 +131,37 @@ Core::Core() exit(EXIT_FAILURE); } - // Register storage backends here! - registerStorageBackend(new SqliteStorage(this)); - registerStorageBackend(new PostgreSqlStorage(this)); + registerStorageBackends(); connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes } void Core::init() { + if(Quassel::isOptionSet("select-backend")) { + switchBackend(Quassel::optionValue("select-backend")); + exit(0); + } + CoreSettings cs; _configured = initStorage(cs.storageSettings().toMap()); if(!_configured) { if(!_storageBackends.count()) { qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); - qWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n" - "Qt library with the sqlite plugin enabled in order for quasselcore\n" + qWarning() << qPrintable(tr("Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" + "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n" "to work.")); exit(1); // TODO make this less brutal (especially for mono client -> popup) } qWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; } + if(Quassel::isOptionSet("migrate-backend")) { + migrateBackend(Quassel::optionValue("migrate-backend")); + exit(0); + } + connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); if(!startListening()) exit(1); // TODO make this less brutal @@ -241,6 +249,11 @@ QString Core::setupCore(QVariantMap setupData) { } /*** Storage Handling ***/ +void Core::registerStorageBackends() { + // Register storage backends here! + registerStorageBackend(new SqliteStorage(this)); + registerStorageBackend(new PostgreSqlStorage(this)); +} bool Core::registerStorageBackend(Storage *backend) { if(backend->isAvailable()) { @@ -252,6 +265,13 @@ bool Core::registerStorageBackend(Storage *backend) { } } +void Core::unregisterStorageBackends() { + foreach(Storage *s, _storageBackends.values()) { + s->deleteLater(); + } + _storageBackends.clear(); +} + void Core::unregisterStorageBackend(Storage *backend) { _storageBackends.remove(backend->displayName()); backend->deleteLater(); @@ -259,10 +279,9 @@ void Core::unregisterStorageBackend(Storage *backend) { // old db settings: // "Type" => "sqlite" -bool Core::initStorage(QVariantMap dbSettings, bool setup) { +bool Core::initStorage(const QString &backend, QVariantMap settings, bool setup) { _storage = 0; - QString backend = dbSettings["Backend"].toString(); if(backend.isEmpty()) { return false; } @@ -275,15 +294,13 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { return false; } - QVariantMap connectionProperties = dbSettings["ConnectionProperties"].toMap(); - - Storage::State storageState = storage->init(connectionProperties); + Storage::State storageState = storage->init(settings); switch(storageState) { case Storage::NeedsSetup: if(!setup) return false; // trigger setup process - if(storage->setup(connectionProperties)) - return initStorage(dbSettings, false); + if(storage->setup(settings)) + return initStorage(backend, settings, false); // if setup wasn't successfull we mark the backend as unavailable case Storage::NotAvailable: qCritical() << "Selected storage backend is not available:" << backend; @@ -293,16 +310,19 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { return false; case Storage::IsReady: // delete all other backends - foreach(Storage *s, _storageBackends.values()) { - if(s != storage) s->deleteLater(); - } - _storageBackends.clear(); + _storageBackends.remove(backend); + unregisterStorageBackends(); connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); } _storage = storage; return true; } +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + return initStorage(dbSettings["Backend"].toString(), dbSettings["ConnectionProperties"].toMap(), setup); +} + + void Core::syncStorage() { if(_storage) _storage->sync(); @@ -505,8 +525,8 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { QVariantMap v; v["DisplayName"] = backend->displayName(); v["Description"] = backend->description(); - v["ConnectionProperties"] = backend->setupKeys(); - qDebug() << backend->setupKeys(); + v["SetupKeys"] = backend->setupKeys(); + v["SetupDefaults"] = backend->setupDefaults(); backends.append(v); } reply["StorageBackends"] = backends; @@ -674,3 +694,142 @@ void Core::socketError(QAbstractSocket::SocketError err) { if(socket && err != QAbstractSocket::RemoteHostClosedError) qWarning() << "Core::socketError()" << socket << err << socket->errorString(); } + +bool Core::migrateBackend(const QString &backend) { + AbstractSqlStorage *sqlStorage = qobject_cast(_storage); + if(!sqlStorage) { + qWarning() << "Core::migrateDb(): only SQL based backends can be migrated!"; + return false; + } + + AbstractSqlMigrationReader *reader = sqlStorage->createMigrationReader(); + if(!reader) { + qWarning() << qPrintable(QString("Core::migrateDb(): unable to migrate storage backend! (No migration reader for %1)").arg(sqlStorage->displayName())); + return false; + } + + + // reregister all storage backends + registerStorageBackends(); + if(_storageBackends.contains(sqlStorage->displayName())) { + unregisterStorageBackend(_storageBackends[sqlStorage->displayName()]); + } + if(!_storageBackends.contains(backend)) { + qWarning() << qPrintable(QString("Core::migrateBackend(): unsupported migration target: %1").arg(backend)); + qWarning() << " supported Targets:" << qPrintable(QStringList(_storageBackends.keys()).join(", ")); + return false; + } + + Storage *storage = _storageBackends[backend]; + QVariantMap settings = promptForSettings(storage); + + Storage::State storageState = storage->init(settings); + switch(storageState) { + case Storage::NotAvailable: + qCritical() << "Core::migrateBackend(): selected storage backend is not available:" << backend; + return false; + case Storage::NeedsSetup: + if(!storage->setup(settings)) { + qWarning() << qPrintable(QString("Core::migrateBackend(): unable to setup target: %1").arg(backend)); + return false; + } + + if(storage->init(settings) != Storage::IsReady) { + qWarning() << qPrintable(QString("Core::migrateBackend(): unable to initialize target: %1").arg(backend)); + return false; + } + case Storage::IsReady: + break; + } + + sqlStorage = qobject_cast(storage); + if(!sqlStorage) { + qWarning() << "Core::migrateDb(): only SQL based backends can be migrated!"; + return false; + } + AbstractSqlMigrationWriter *writer = sqlStorage->createMigrationWriter(); + if(!writer) { + qWarning() << qPrintable(QString("Core::migrateDb(): unable to migrate storage backend! (No migration writer for %1)").arg(backend)); + return false; + } + + qDebug() << qPrintable(QString("Migrating Storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName())); + delete _storage; + _storage = 0; + delete storage; + storage = 0; + if(reader->migrateTo(writer)) { + qDebug() << "Migration finished!"; + saveBackendSettings(backend, settings); + return true; + } + return false; +} + +bool Core::switchBackend(const QString &backend) { + if(!_storageBackends.contains(backend)) { + qWarning() << qPrintable(QString("Core::switchBackend(): unsupported backend: %1").arg(backend)); + qWarning() << " supported backends:" << qPrintable(QStringList(_storageBackends.keys()).join(", ")); + return false; + } + + Storage *storage = _storageBackends[backend]; + QVariantMap settings = promptForSettings(storage); + + bool ok = initStorage(backend, settings, true /* initial setup is allowed */); + if(ok) { + saveBackendSettings(backend, settings); + qWarning() << "Switched backend to:" << qPrintable(backend); + } else { + qWarning() << "Failed to switch backend to:" << qPrintable(backend); + } + return ok; +} + +void Core::saveBackendSettings(const QString &backend, const QVariantMap &settings) { + QVariantMap dbsettings; + dbsettings["Backend"] = backend; + dbsettings["ConnectionProperties"] = settings; + CoreSettings().setStorageSettings(dbsettings); +} + +QVariantMap Core::promptForSettings(const Storage *storage) { + QVariantMap settings; + + QStringList keys = storage->setupKeys(); + if(keys.isEmpty()) + return settings; + + QTextStream out(stdout); + QTextStream in(stdin); + out << "!!!Warning: echo mode is always on even if asked for a password!!!" << endl; + out << "Default values are in brackets" << endl; + + QVariantMap defaults = storage->setupDefaults(); + QString value; + foreach(QString key, keys) { + QVariant val; + if(defaults.contains(key)) { + val = defaults[key]; + } + out << key; + if(!val.toString().isEmpty()) { + out << " (" << val.toString() << ")"; + } + out << ": "; + out.flush(); + value = in.readLine().trimmed(); + + if(!value.isEmpty()) { + switch(defaults[key].type()) { + case QVariant::Int: + val = QVariant(value.toInt()); + break; + default: + val = QVariant(value); + } + } + settings[key] = val; + } + return settings; +}