From 55eedca83c242a49a671fd9eeabe86362704cb41 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 5 Sep 2017 17:12:28 +0200
Subject: Revert "Request shutdown instead of doing a std::quick_exit."

---
 storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index 55de1d9ee87..bc13d8b31ab 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/util/host_name.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/component/vtag.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".status");
@@ -91,8 +92,8 @@ void StatusWebServer::configure(std::unique_ptr<vespa::config::content::core::St
             if (_httpServer.get() != 0) {
                 ost << " Status server still running on port " << _port << " instead of suggested port " << newPort;
             }
-            LOG(fatal, "%s.", ost.str().c_str());
-            _component->requestShutdown(ost.str());
+            LOG(fatal, "Failed to start status HTTP server using port %u. Old port was %u. Exiting.", newPort, _port);
+            std::quick_exit(67);
         }
             // Now that we know config update went well, update internal state
         _port = server->getListenPort();
-- 
cgit v1.2.3