Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/225028
Change subject: Really abort, if ES version could not be fetched ...................................................................... Really abort, if ES version could not be fetched Don't just output, that the task is aborted, really abort it. Change-Id: Ica785eebbe39bf9db9afd49ecfe0e406fcbc0faa Also: Extend for version number check to prevent php Notices. --- M includes/Maintenance/ConfigUtils.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/28/225028/1 diff --git a/includes/Maintenance/ConfigUtils.php b/includes/Maintenance/ConfigUtils.php index 014cdc2..2ecacd3 100644 --- a/includes/Maintenance/ConfigUtils.php +++ b/includes/Maintenance/ConfigUtils.php @@ -47,8 +47,8 @@ $this->outputIndented( 'Fetching Elasticsearch version...' ); $result = $this->client->request( '' ); $result = $result->getData(); - if ( !isset( $result['version']['number'] ) ) { - $this->output( 'unable to determine, aborting.', 1 ); + if ( !isset( $result['version'] ) || !isset( $result['version']['number'] ) { + $this->error( 'unable to determine, aborting.', 1 ); } $result = $result[ 'version' ][ 'number' ]; $this->output( "$result..." ); -- To view, visit https://gerrit.wikimedia.org/r/225028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica785eebbe39bf9db9afd49ecfe0e406fcbc0faa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits