Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 22:36:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use an auto_ptr to be able to reset the AccountManager

Browse source
This commit is contained in:
Stephen Birarda 2014-09-30 14:36:32 -07:00
parent 909a6e89a8
commit fed7dad2b6
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,6 +81,11 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::restart() { void DomainServer::restart() {
qDebug() << "domain-server is restarting."; qDebug() << "domain-server is restarting.";
// make sure all static instances are reset
LimitedNodeList::getInstance()->reset();
AccountManager::getInstance(true);
exit(DomainServer::EXIT_CODE_REBOOT); exit(DomainServer::EXIT_CODE_REBOOT);
} }

11
libraries/networking/src/AccountManager.cpp
View file

@ -25,9 +25,14 @@
const bool VERBOSE_HTTP_REQUEST_DEBUGGING = false; const bool VERBOSE_HTTP_REQUEST_DEBUGGING = false;
AccountManager& AccountManager::getInstance() { AccountManager& AccountManager::getInstance(bool forceReset) {
static AccountManager sharedInstance; static std::auto_ptr<AccountManager> sharedInstance(new AccountManager());
return sharedInstance;
if (forceReset) {
sharedInstance.reset(new AccountManager());
}
return *sharedInstance;
} }
Q_DECLARE_METATYPE(OAuthAccessToken) Q_DECLARE_METATYPE(OAuthAccessToken)

2
libraries/networking/src/AccountManager.h
View file

@ -42,7 +42,7 @@ const QByteArray ACCESS_TOKEN_AUTHORIZATION_HEADER = "Authorization";
class AccountManager : public QObject { class AccountManager : public QObject {
Q_OBJECT Q_OBJECT
public: public:
static AccountManager& getInstance(); static AccountManager& getInstance(bool forceReset = false);
void authenticatedRequest(const QString& path, void authenticatedRequest(const QString& path,
QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,