Skip to content

Commit

Permalink
Closes #1137
Browse files Browse the repository at this point in the history
  • Loading branch information
Rashid Khan committed Apr 10, 2014
1 parent 9578751 commit 3813428
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/app/services/esVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ function (angular, _, config) {
var nodeInfo = ejs.client.get('/_nodes',
undefined, undefined, function(data, status) {
if(status === 0) {
alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.config.server+
alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.client.server()+
". Please ensure that Elasticsearch is reachable from your system." ,'error');
} else {
alertSrv.set('Error',"Could not reach "+ejs.config.server+"/_nodes. If you"+
alertSrv.set('Error',"Could not reach "+ejs.client.server()+"/_nodes. If you"+
" are using a proxy, ensure it is configured correctly",'error');
}
return;
});

return nodeInfo.then(function(p) {
Expand Down Expand Up @@ -144,6 +145,10 @@ function (angular, _, config) {

// Determine if a specific version is greater than or equal to another
this.compare = function (required,installed) {
if(!required || !installed) {
return undefined;
}

var a = installed.split('.');
var b = required.split('.');
var i;
Expand Down

0 comments on commit 3813428

Please sign in to comment.