fix elasticsearch setup check that was broken by jnovack

[phorkie.git] / src / phorkie / SetupCheck.php

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index f1fbc0f519e69d63d773e88db52b4713c8867a6d..95fd75993d2c3b88076573e75059915da39cd2c3 100644 (file)
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -32,9 +32,7 @@ class SetupCheck
         $sc->checkDeps();
         $sc->checkDirs();
         $sc->checkGit();
-        if ($this->elasticsearch != '') {
-            $sc->checkDatabase();
-        }
+        $sc->checkDatabase();
     }
 
     public function checkDeps()
@@ -76,6 +74,10 @@ class SetupCheck
 
     public function checkDatabase()
     {
+        if ($this->elasticsearch != '') {
+            return;
+        }
+
         $es = parse_url($this->elasticsearch);
         if (!preg_match("#/.+/#", $es['path'], $matches)) {
             $this->fail('Improper elasticsearch url.  Elasticsearch requires a'