Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-11 00:25:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure backup handlers end up on the correct thread

Browse source
This commit is contained in:
Stephen Birarda 2018-02-15 15:39:25 -08:00
parent f624e1b464
commit f5cad5683d
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
domain-server/src/DomainContentBackupManager.cpp
View file

@ -155,9 +155,6 @@ bool DomainContentBackupManager::process() {
}
void DomainContentBackupManager::aboutToFinish() {
qCDebug(domain_server) << "Persist thread about to finish...";
backup();
qCDebug(domain_server) << "Persist thread done with about to finish...";
_stopThread = true;
}

12
domain-server/src/DomainServer.cpp
View file

@ -298,9 +298,13 @@ DomainServer::DomainServer(int argc, char* argv[]) :
maybeHandleReplacementEntityFile();
_contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
_contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
_contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
_contentManager->addBackupHandler(BackupHandlerPointer(new ContentSettingsBackupHandler(_settingsManager)));
connect(_contentManager.get(), &DomainContentBackupManager::started, _contentManager.get(), [this](){
_contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
_contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
_contentManager->addBackupHandler(BackupHandlerPointer(new ContentSettingsBackupHandler(_settingsManager)));
});
_contentManager->initialize(true);
qDebug() << "Existing backups:";
@ -382,7 +386,7 @@ DomainServer::~DomainServer() {
if (_contentManager) {
_contentManager->aboutToFinish();
_contentManager->terminating();
_contentManager->terminate();
}
}

2
libraries/shared/src/GenericThread.cpp
View file

@ -38,6 +38,8 @@ void GenericThread::initialize(bool isThreaded, QThread::Priority priority) {
_thread->setObjectName(objectName());
// when the worker thread is started, call our engine's run..
connect(_thread, &QThread::started, this, &GenericThread::started);
connect(_thread, &QThread::started, this, &GenericThread::threadRoutine);
connect(_thread, &QThread::finished, this, &GenericThread::finished);

1
libraries/shared/src/GenericThread.h
View file

@ -47,6 +47,7 @@ public slots:
void threadRoutine();
signals:
void started();
void finished();
protected: