From 6fd517647475ff4d34f8887de949274719d66b00 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 21 Jan 2016 17:54:10 -0800
Subject: [PATCH] Pospone logging of the shutdown reason
This makes it more obvious to the log reader why the DS went
down.
---
libraries/embedded-webserver/src/HTTPManager.cpp | 10 ++++++----
libraries/embedded-webserver/src/HTTPManager.h | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index 7cbdf01bbc..bd256578d8 100644
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -184,13 +184,15 @@ bool HTTPManager::bindSocket() {
return true;
} else {
- qCritical() << "Failed to open HTTP server socket:" << errorString() << " can't continue";
- QMetaObject::invokeMethod(this, "queuedExit", Qt::QueuedConnection);
-
+ QString errorMessage = "Failed to open HTTP server socket: " + errorString() + ", can't continue";
+ QMetaObject::invokeMethod(this, "queuedExit", Qt::QueuedConnection, Q_ARG(QString, errorMessage));
return false;
}
}
-void HTTPManager::queuedExit() {
+void HTTPManager::queuedExit(QString errorMessage) {
+ if (!errorMessage.isEmpty()) {
+ qCCritical(embeddedwebserver) << qPrintable(errorMessage);
+ }
QCoreApplication::exit(SOCKET_ERROR_EXIT_CODE);
}
diff --git a/libraries/embedded-webserver/src/HTTPManager.h b/libraries/embedded-webserver/src/HTTPManager.h
index 90a896ccf5..c560c43a5e 100644
--- a/libraries/embedded-webserver/src/HTTPManager.h
+++ b/libraries/embedded-webserver/src/HTTPManager.h
@@ -39,7 +39,7 @@ public:
private slots:
void isTcpServerListening();
- void queuedExit();
+ void queuedExit(QString errorMessage);
private:
bool bindSocket();