diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-06 12:14:59 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-06 12:14:59 +0200 |
commit | abb934f91cc30700f3f38ea6dba2fe3bb75dd036 (patch) | |
tree | f178e146ad978c5e3f9e6d980f0954725255716b | |
parent | f8efaab3d1c8116afc1dc2b3cdf65248ede5c58e (diff) |
Use std::_Exit instead of std::quick_exit.
5 files changed, 5 insertions, 5 deletions
diff --git a/config/src/vespa/config/helper/configpoller.cpp b/config/src/vespa/config/helper/configpoller.cpp index a1dc9570f6a..0ac7d46ce63 100644 --- a/config/src/vespa/config/helper/configpoller.cpp +++ b/config/src/vespa/config/helper/configpoller.cpp @@ -27,7 +27,7 @@ ConfigPoller::run() } } catch (config::InvalidConfigException & e) { LOG(fatal, "Got exception, will just exit quickly : %s", e.what()); - std::quick_exit(17); + std::_Exit(17); } } diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp index 0f2576aa66e..3bb9841d791 100644 --- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp +++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp @@ -52,7 +52,7 @@ ReconfigurableStateServer::configure(std::unique_ptr<vespa::config::core::States } catch (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); + std::_Exit(17); } } diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp index e49beb79fde..3c2d040010c 100644 --- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp +++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp @@ -59,7 +59,7 @@ void StatusWebServer::configure(std::unique_ptr<vespa::config::content::core::St } 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); + std::_Exit(17); } // Now that we know config update went well, update internal state _port = server->getListenPort(); diff --git a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp index ddc2ff14498..a52d4eeb690 100644 --- a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp +++ b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp @@ -234,7 +234,7 @@ CryptoEngine::SP try_create_default_crypto_engine() { return create_default_crypto_engine(); } catch (net::tls::CryptoException &e) { LOG(error, "failed to create default crypto engine: %s", e.what()); - std::quick_exit(78); + std::_Exit(78); } } diff --git a/vespalib/src/vespa/vespalib/util/exceptions.cpp b/vespalib/src/vespa/vespalib/util/exceptions.cpp index cdfa91c25ac..64ce947b5c0 100644 --- a/vespalib/src/vespa/vespalib/util/exceptions.cpp +++ b/vespalib/src/vespa/vespalib/util/exceptions.cpp @@ -33,7 +33,7 @@ vespalib::string _G_what; void silent_terminate() { std::lock_guard<std::mutex> guard(_G_silence_mutex); LOG(fatal, "Will exit with code 66 due to: %s", _G_what.c_str()); - std::quick_exit(66); + std::_Exit(66); } } |