From 0f4467c5829a8f3389766dc235c0950f68ab80e3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 11 Feb 2016 15:17:34 -0800 Subject: [PATCH] cleanup exit codes for queued DS exit --- domain-server/src/DomainServer.cpp | 4 ++-- domain-server/src/DomainServerSettingsManager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index e30e009520..d68a2cfc8e 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -211,7 +211,7 @@ bool DomainServer::optionallySetupOAuth() { || _oauthClientID.isEmpty() || _oauthClientSecret.isEmpty()) { static const QString MISSING_OAUTH_INFO_MSG = "Missing OAuth provider URL, hostname, client ID, or client secret. domain-server will now quit."; - static const int MISSING_OAUTH_INFO_ERROR_CODE = 1542; + static const int MISSING_OAUTH_INFO_ERROR_CODE = 4; QMetaObject::invokeMethod(this, "queuedQuit", Qt::QueuedConnection, Q_ARG(QString, MISSING_OAUTH_INFO_MSG), Q_ARG(int, MISSING_OAUTH_INFO_ERROR_CODE)); return false; @@ -420,7 +420,7 @@ bool DomainServer::resetAccountManagerAccessToken() { static const QString MISSING_OAUTH_PROVIDER_MSG = QString("Missing OAuth provider URL, but a domain-server feature was required that requires authentication.") + QString("domain-server will now quit."); - static const int MISSING_OAUTH_PROVIDER_ERROR_CODE = 5323; + static const int MISSING_OAUTH_PROVIDER_ERROR_CODE = 5; QMetaObject::invokeMethod(this, "queuedQuit", Qt::QueuedConnection, Q_ARG(QString, MISSING_OAUTH_PROVIDER_MSG), Q_ARG(int, MISSING_OAUTH_PROVIDER_ERROR_CODE)); diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 2cf62bd00a..49ae03ccd4 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -65,7 +65,7 @@ DomainServerSettingsManager::DomainServerSettingsManager() : static const QString MISSING_SETTINGS_DESC_MSG = QString("Did not find settings decription in JSON at %1 - Unable to continue. domain-server will quit.") .arg(SETTINGS_DESCRIPTION_RELATIVE_PATH); - static const int MISSING_SETTINGS_DESC_ERROR_CODE = 8912; + static const int MISSING_SETTINGS_DESC_ERROR_CODE = 6; QMetaObject::invokeMethod(QCoreApplication::instance(), "queuedQuit", Qt::QueuedConnection, Q_ARG(QString, MISSING_SETTINGS_DESC_MSG),