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

fix for AccountManagerAuth::Type register, consts

Browse source
This commit is contained in:
Stephen Birarda 2016-03-25 10:47:06 -07:00
parent 0043a84234
commit d8859def37
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,6 +81,8 @@ AccountManager::AccountManager() :
qRegisterMetaType<QHttpMultiPart*>("QHttpMultiPart*"); qRegisterMetaType<QHttpMultiPart*>("QHttpMultiPart*");
qRegisterMetaType<AccountManagerAuth::Type>();
connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged); connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged);
} }
@ -215,7 +217,7 @@ void AccountManager::sendRequest(const QString& path,
if (thread() != QThread::currentThread()) { if (thread() != QThread::currentThread()) {
QMetaObject::invokeMethod(this, "sendRequest", QMetaObject::invokeMethod(this, "sendRequest",
Q_ARG(const QString&, path), Q_ARG(const QString&, path),
Q_ARG(AccountManagerAuth::Type, AccountManagerAuth::Required), Q_ARG(AccountManagerAuth::Type, authType),
Q_ARG(QNetworkAccessManager::Operation, operation), Q_ARG(QNetworkAccessManager::Operation, operation),
Q_ARG(const JSONCallbackParameters&, callbackParams), Q_ARG(const JSONCallbackParameters&, callbackParams),
Q_ARG(const QByteArray&, dataByteArray), Q_ARG(const QByteArray&, dataByteArray),

6
libraries/networking/src/UserActivityLogger.cpp
View file

@ -58,8 +58,6 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall
// if no callbacks specified, call our owns // if no callbacks specified, call our owns
if (params.isEmpty()) { if (params.isEmpty()) {
params.jsonCallbackReceiver = this;
params.jsonCallbackMethod = "requestFinished";
params.errorCallbackReceiver = this; params.errorCallbackReceiver = this;
params.errorCallbackMethod = "requestError"; params.errorCallbackMethod = "requestError";
} }
@ -70,10 +68,6 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall
params, NULL, multipart); params, NULL, multipart);
} }
void UserActivityLogger::requestFinished(QNetworkReply& requestReply) {
// qCDebug(networking) << object;
}
void UserActivityLogger::requestError(QNetworkReply& errorReply) { void UserActivityLogger::requestError(QNetworkReply& errorReply) {
qCDebug(networking) << errorReply.error() << "-" << errorReply.errorString(); qCDebug(networking) << errorReply.error() << "-" << errorReply.errorString();
} }

1
libraries/networking/src/UserActivityLogger.h
View file

@ -39,7 +39,6 @@ public slots:
void wentTo(QString destinationType, QString destinationName); void wentTo(QString destinationType, QString destinationName);
private slots: private slots:
void requestFinished(QNetworkReply& requestReply);
void requestError(QNetworkReply& errorReply); void requestError(QNetworkReply& errorReply);
private: private:

6
libraries/networking/src/udt/SendQueue.cpp
View file

@ -337,8 +337,8 @@ void SendQueue::run() {
// which can lock the NodeList if it's attempting to clear connections // which can lock the NodeList if it's attempting to clear connections
// for now we guard this by capping the time this thread and sleep for // for now we guard this by capping the time this thread and sleep for
const int MAX_SEND_QUEUE_SLEEP_USECS = 5000000; const microseconds MAX_SEND_QUEUE_SLEEP_USECS { 5000000 };
if (timeToSleep.count() > MAX_SEND_QUEUE_SLEEP_USECS) { if (timeToSleep > MAX_SEND_QUEUE_SLEEP_USECS) {
// alright, we're in a weird state // alright, we're in a weird state
// we want to know why this is happening so we can implement a better fix than this guard // we want to know why this is happening so we can implement a better fix than this guard
// send some details up to the API (if the user allows us) that indicate how we could such a large timeToSleep // send some details up to the API (if the user allows us) that indicate how we could such a large timeToSleep
@ -355,7 +355,7 @@ void SendQueue::run() {
// hopefully send this event using the user activity logger // hopefully send this event using the user activity logger
UserActivityLogger::getInstance().logAction(SEND_QUEUE_LONG_SLEEP_ACTION, longSleepObject); UserActivityLogger::getInstance().logAction(SEND_QUEUE_LONG_SLEEP_ACTION, longSleepObject);
timeToSleep = std::chrono::microseconds(MAX_SEND_QUEUE_SLEEP_USECS); timeToSleep = MAX_SEND_QUEUE_SLEEP_USECS;
} }
std::this_thread::sleep_for(timeToSleep); std::this_thread::sleep_for(timeToSleep);