Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>)

Browse source 
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
This commit is contained in:
Heather Anderson 2020-04-25 20:32:38 -07:00
parent 2d6d205bf2
commit e29271d8ca
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -608,7 +608,7 @@ Menu::Menu() {
0, 0,
false, false,
&UserActivityLogger::getInstance(), &UserActivityLogger::getInstance(),
SLOT(crashDisable(bool))); SLOT(crashMonitorDisable(bool)));
addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0, addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
qApp, SLOT(loadDomainConnectionDialog())); qApp, SLOT(loadDomainConnectionDialog()));

4
interface/src/main.cpp
View file

@ -218,12 +218,12 @@ int main(int argc, const char* argv[]) {
} }
qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled(); qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled();
if (ual.isCrashEnabled()) { qDebug() << "Crash handler logger is enabled:" << ual.isCrashMonitorEnabled();
if (ual.isCrashMonitorEnabled()) {
auto crashHandlerStarted = startCrashHandler(argv[0]); auto crashHandlerStarted = startCrashHandler(argv[0]);
qDebug() << "Crash handler started:" << crashHandlerStarted; qDebug() << "Crash handler started:" << crashHandlerStarted;
} }
const QString& applicationName = getInterfaceSharedMemoryName(); const QString& applicationName = getInterfaceSharedMemoryName();
bool instanceMightBeRunning = true; bool instanceMightBeRunning = true;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

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

@ -34,8 +34,8 @@ void UserActivityLogger::disable(bool disable) {
_disabled.set(disable); _disabled.set(disable);
} }
void UserActivityLogger::crashDisable(bool disable) { void UserActivityLogger::crashMonitorDisable(bool disable) {
_crashDisabled.set(disable); _crashMonitorDisabled.set(disable);
} }
void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) { void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) {

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

@ -35,11 +35,11 @@ public slots:
bool isEnabled() { return !_disabled.get(); } bool isEnabled() { return !_disabled.get(); }
bool isDisabledSettingSet() const { return _disabled.isSet(); } bool isDisabledSettingSet() const { return _disabled.isSet(); }
bool isCrashEnabled() { return !_crashDisabled.get(); } bool isCrashMonitorEnabled() { return !_crashMonitorDisabled.get(); }
bool isCrashDisabledSettingSet() const { return _crashDisabled.isSet(); } bool isCrashMonitorDisabledSettingSet() const { return _crashMonitorDisabled.isSet(); }
void disable(bool disable); void disable(bool disable);
void crashDisable(bool disable); void crashMonitorDisable(bool disable);
void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters());
void launch(QString applicationVersion, bool previousSessionCrashed, int previousSessionRuntime); void launch(QString applicationVersion, bool previousSessionCrashed, int previousSessionRuntime);
@ -59,7 +59,7 @@ private slots:
private: private:
UserActivityLogger(); UserActivityLogger();
Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", true }; Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", true };
Setting::Handle<bool> _crashDisabled { "CrashLoggerDisabled", false }; Setting::Handle<bool> _crashMonitorDisabled { "CrashMonitorDisabled", false };
QElapsedTimer _timer; QElapsedTimer _timer;
}; };