Revert "Hardwire matchengine to always be online."

2 files changed, 4 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp
index fefb5257868..9ae938981a4 100644
--- a/searchcore/src/tests/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp
@@ -190,7 +190,8 @@ TEST("requireThatStateIsReported")
     EXPECT_EQUAL(
             "{\n"
             "    \"status\": {\n"
-            "        \"state\": \"ONLINE\"\n"
+            "        \"state\": \"OFFLINE\",\n"
+            "        \"message\": \"Search interface is offline\"\n"
             "    }\n"
             "}\n",
             slime.toString());
diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index 17303f631b5..8fcb30a4143 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -45,7 +45,7 @@ MatchEngine::MatchEngine(size_t numThreads, size_t threadsPerSearch, uint32_t di
       _handlers(),
       _executor(std::max(size_t(1), numThreads / threadsPerSearch), 256 * 1024),
       _threadBundlePool(std::max(size_t(1), threadsPerSearch)),
-      _nodeUp(true)
+      _nodeUp(false)
 {
     // empty
 }
@@ -151,7 +151,7 @@ bool MatchEngine::isOnline() const {
 void
 MatchEngine::setNodeUp(bool nodeUp)
 {
-    _nodeUp = nodeUp || true;
+    _nodeUp = nodeUp;
 }