You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zh...@apache.org on 2017/04/16 09:48:29 UTC
ranger git commit: RANGER-1445:Incorrect error message for searching
in Audit page
Repository: ranger
Updated Branches:
refs/heads/master 73c2faa49 -> 88c73dfe6
RANGER-1445:Incorrect error message for searching in Audit page
Signed-off-by: zhangqiang2 <zh...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/88c73dfe
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/88c73dfe
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/88c73dfe
Branch: refs/heads/master
Commit: 88c73dfe682c9b868c6c8c8ecc34082afb5e1e71
Parents: 73c2faa
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Fri Mar 10 16:22:37 2017 +0800
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Sun Apr 16 05:47:11 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/ranger/solr/SolrUtil.java | 4 ++--
.../src/main/webapp/scripts/utils/XAUtils.js | 15 +++++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/88c73dfe/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
index fcadf38..049985c 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
@@ -157,9 +157,9 @@ public class SolrUtil {
QueryResponse response = runQuery(solrClient, query);
if (response == null || response.getStatus() != 0) {
- logger.error("Error running query. query=" + query
+ logger.error("Error running solr query. query=" + query
+ ", response=" + response);
- throw restErrorUtil.createRESTException("Error running query",
+ throw restErrorUtil.createRESTException("Error running solr query",
MessageEnums.ERROR_SYSTEM);
}
return response;
http://git-wip-us.apache.org/repos/asf/ranger/blob/88c73dfe/security-admin/src/main/webapp/scripts/utils/XAUtils.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
index 7a35ce3..480c515 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
@@ -777,15 +777,18 @@ define(function(require) {
reset : true,
cache : false,
error : function(coll, response, options) {
- that.notifyError('Error', localization.tt('msg.errorLoadingAuditLogs'));
+ that.blockUI('unblock');
+ var errorMsg;
+ if(!_.isUndefined(response) && !_.isUndefined(response.responseJSON) && !_.isUndefined(response.responseJSON.msgDesc)){
+ errorMsg = response.responseJSON.msgDesc;
+ }
+ else {
+ errorMsg = localization.tt('msg.errorLoadingAuditLogs');
+ }
+ that.notifyError('Error', errorMsg);
}
- // data : params,
});
};
- // var searchOpt = ['Event Time','User','Resource Name','Resource
- // ID','Resource Type','Repository Name','Repository
- // Type','Result','Client IP','Client Type','Access Type','Access
- // Enforcer','Audit Type','Session ID'];
var callbackCommon = {
search : function(query, searchCollection) {