Merge pull request #7549 from fmatthew5876/master

Report TCPServer errorString() if webui fails to listen to port
qbittorrent · Oct 11, 2017 · e075012 · e075012
2 parents 2977ba9 + 5185eeb
commit e075012
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/webui/webui.cpp b/src/webui/webui.cpp
@@ -28,6 +28,10 @@
 
 #include "webui.h"
 
+#ifdef DISABLE_GUI
+#include <QCoreApplication>
+#endif
+
 #include "base/http/server.h"
 #include "base/logger.h"
 #include "base/net/dnsupdater.h"
@@ -90,10 +94,17 @@ void WebUI::init()
 
         if (!m_httpServer->isListening()) {
             bool success = m_httpServer->listen(QHostAddress::Any, m_port);
-            if (success)
+            if (success) {
                 logger->addMessage(tr("Web UI: Now listening on port %1").arg(m_port));
-            else
-                logger->addMessage(tr("Web UI: Unable to bind to port %1").arg(m_port), Log::CRITICAL);
+            }
+            else {
+                const QString errorMsg = tr("Web UI: Unable to bind to port %1. %2").arg(m_port).arg(m_httpServer->errorString());
+                logger->addMessage(errorMsg, Log::CRITICAL);
+#ifdef DISABLE_GUI
+                qCritical() << errorMsg;
+                QCoreApplication::exit(1);
+#endif
+            }
         }
 
         // DynDNS