Repository: ambari Updated Branches: refs/heads/branch-2.4 3ba622c2e -> 91a8ab01c
AMBARI-17541. LogSearch should also show audit logs from Apache Ranger Solr appendum (Dharmesh Makwana via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91a8ab01 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91a8ab01 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91a8ab01 Branch: refs/heads/branch-2.4 Commit: 91a8ab01c5ade7874b42ebc9777cb1037ebffe2f Parents: 3ba622c Author: oleewere <[email protected]> Authored: Tue Jul 12 11:50:05 2016 +0200 Committer: oleewere <[email protected]> Committed: Tue Jul 12 11:52:42 2016 +0200 ---------------------------------------------------------------------- .../apache/ambari/logsearch/dao/SolrDaoBase.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91a8ab01/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java index d57daa6..60d7682 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java @@ -277,16 +277,16 @@ public abstract class SolrDaoBase { + aliasNameIn + ", collectionList=" + collectionsCSV + ", solrDetail=" + solrDetail + ", response=" + createResponse); + return 0; } + } + if( collectionToAdd.size() == collectionListIn.size()) { + logger.info("Created alias for all collections. alias=" + aliasNameIn + ", collectionsCSV=" + + collectionsCSV + ", solrDetail=" + solrDetail); } else { - if( collectionToAdd.size() == collectionListIn.size()) { - logger.info("Created alias for all collections. alias=" + aliasNameIn + ", collectionsCSV=" - + collectionsCSV + ", solrDetail=" + solrDetail); - } else { - logger.info("Created alias for " + collectionToAdd.size() + " out of " + - + collectionListIn.size() + " collections. alias=" + aliasNameIn - + ", collectionsCSV=" + collectionsCSV + ", solrDetail=" + solrDetail); - } + logger.info("Created alias for " + collectionToAdd.size() + " out of " + + + collectionListIn.size() + " collections. alias=" + aliasNameIn + + ", collectionsCSV=" + collectionsCSV + ", solrDetail=" + solrDetail); } return collectionToAdd.size(); }
