diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2012-09-27 19:36:15 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2012-09-27 19:36:15 +0200 |
| commit | 1ee8f2a206337af0c910400444c312d354cd4dea (patch) | |
| tree | 17e2f58539a34f7105cdb40e284b3532e0fcb04d /src/phorkie/SetupCheck.php | |
| parent | 12f8fc8ebc9ed683604a357237d79ee5687b7d11 (diff) | |
| download | phorkie-1ee8f2a206337af0c910400444c312d354cd4dea.tar.gz phorkie-1ee8f2a206337af0c910400444c312d354cd4dea.zip | |
fix elasticsearch setup check that was broken by jnovack
Diffstat (limited to 'src/phorkie/SetupCheck.php')
| -rw-r--r-- | src/phorkie/SetupCheck.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php index f1fbc0f..95fd759 100644 --- 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' |