Quck bail out when port can not be listened to.

1 files changed, 8 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index 1d3827d9971..2f6346c91b9 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -55,8 +55,14 @@ void StatusWebServer::configure(std::unique_ptr<vespa::config::content::core::St
     std::unique_ptr<WebServer> server;
         // Negative port number means don't run the web server
     if (newPort >= 0) {
-        server.reset(new WebServer(*this, newPort));
-            // Now that we know config update went well, update internal state
+        try {
+            server.reset(new WebServer(*this, newPort));
+        } catch (const vespalib::PortListenException & e) {
+            LOG(error, "Failed listening to network port(%d) with protocol(%s): '%s', giving up and restarting.",
+                e.get_port(), e.get_protocol().c_str(), e.what());
+            std::quick_exit(17);
+        }
+        // Now that we know config update went well, update internal state
         _port = server->getListenPort();
         LOG(config, "Status pages now available on port %u", _port);
         if (_httpServer) {