diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 08:53:21 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-05 20:45:27 +0200 |
commit | 8ae7332f3e4297121fb9f50972ded38ef94aa5ca (patch) | |
tree | 3849da9d6e27f03b9011b0ead0b95e0a8123eea1 /storage | |
parent | ffc04e71743404f903a60e83e2f24fe527e71b0c (diff) |
Request shutdown instead of doing a std::quick_exit.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp index bc13d8b31ab..55de1d9ee87 100644 --- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp +++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp @@ -7,7 +7,6 @@ #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"); @@ -92,8 +91,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, "Failed to start status HTTP server using port %u. Old port was %u. Exiting.", newPort, _port); - std::quick_exit(67); + LOG(fatal, "%s.", ost.str().c_str()); + _component->requestShutdown(ost.str()); } // Now that we know config update went well, update internal state _port = server->getListenPort(); |