[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Pranav Kant]

 wsd/LOOLWSD.cpp |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit f246f50b9e5b36daa47e35e42eac34a1ae391c2c
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Feb 8 17:04:55 2018 +0530

    Don't try different ports unless we are testing
    
    Change-Id: Ideb6b6ccb64f708bf4621cfc92c5836a0fd3b511

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9c598725..5ae13552 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2565,6 +2565,7 @@ private:
         std::shared_ptr<ServerSocket> socket = getServerSocket(
             ServerSocket::Type::Local, port, PrisonerPoll, factory);
 
+#ifdef BUILDING_TESTS
         // If we fail, try the next 100 ports.
         for (int i = 0; i < 100 && !socket; ++i)
         {
@@ -2573,10 +2574,11 @@ private:
             socket = getServerSocket(
             ServerSocket::Type::Local, port, PrisonerPoll, factory);
         }
+#endif
 
-        if (!UnitWSD::isUnitTesting() && !socket)
+        if (!socket)
         {
-            LOG_FTL("Failed to listen on Prisoner port (" <<
+            LOG_FTL("Failed to listen on Prisoner port(s) (" <<
                     MasterPortNumber << '-' << port << "). Exiting.");
             _exit(Application::EXIT_SOFTWARE);
         }
@@ -2598,8 +2600,10 @@ private:
 #endif
             factory = std::make_shared<PlainSocketFactory>();
 
+
         std::shared_ptr<ServerSocket> socket = getServerSocket(
             ServerSocket::Type::Public, port, WebServerPoll, factory);
+#ifdef BUILDLING_TESTS
         while (!socket)
         {
             ++port;
@@ -2607,6 +2611,14 @@ private:
             socket = getServerSocket(
                 ServerSocket::Type::Public, port, WebServerPoll, factory);
         }
+#endif
+
+        if (!socket)
+        {
+            LOG_FTL("Failed to listen on Server port(s) (" <<
+                    ClientPortNumber << '-' << port << "). Exiting.");
+            _exit(Application::EXIT_SOFTWARE);
+        }
 
         ClientPortNumber = port;
         LOG_INF("Listening to client connections on port " << port);