From cb7b23f3467905aacff60469cbf64872c39aa761 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 28 May 2015 17:04:15 -0700 Subject: [PATCH] install DS message handler in DomainServer --- domain-server/src/DomainServer.cpp | 2 ++ domain-server/src/main.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 24d2d4812e..57d687f307 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -65,6 +65,8 @@ DomainServer::DomainServer(int argc, char* argv[]) : _settingsManager(), _iceServerSocket(ICE_SERVER_DEFAULT_HOSTNAME, ICE_SERVER_DEFAULT_PORT) { + qInstallMessageHandler(LogHandler::verboseMessageHandler); + LogUtils::init(); Setting::init(); diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index ba80e6fce0..790cc07c56 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -26,18 +26,16 @@ int main(int argc, char* argv[]) { #ifndef WIN32 setvbuf(stdout, NULL, _IOLBF, 0); #endif - - qInstallMessageHandler(LogHandler::verboseMessageHandler); - + int currentExitCode = 0; - + // use a do-while to handle domain-server restart do { DomainServer domainServer(argc, argv); currentExitCode = domainServer.exec(); } while (currentExitCode == DomainServer::EXIT_CODE_REBOOT); - - + + return currentExitCode; }