Return-Path: X-Original-To: apmail-ranger-commits-archive@www.apache.org Delivered-To: apmail-ranger-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71FB6172EF for ; Sat, 23 May 2015 02:32:26 +0000 (UTC) Received: (qmail 55587 invoked by uid 500); 23 May 2015 02:05:45 -0000 Delivered-To: apmail-ranger-commits-archive@ranger.apache.org Received: (qmail 55560 invoked by uid 500); 23 May 2015 02:05:45 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 55551 invoked by uid 99); 23 May 2015 02:05:45 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2015 02:05:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id B083D1A3136 for ; Sat, 23 May 2015 02:05:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id i2LJByMpdLDX for ; Sat, 23 May 2015 02:05:36 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 0E26A217D8 for ; Sat, 23 May 2015 02:05:35 +0000 (UTC) Received: (qmail 55311 invoked by uid 99); 23 May 2015 02:05:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2015 02:05:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BB68E03E4; Sat, 23 May 2015 02:05:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@ranger.incubator.apache.org Date: Sat, 23 May 2015 02:05:54 -0000 Message-Id: <40b470e591cf4f458f9daee45f44c247@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/26] incubator-ranger git commit: RANGER-500 - Check for url property also RANGER-500 - Check for url property also Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/54caee22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/54caee22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/54caee22 Branch: refs/heads/tag-policy Commit: 54caee221cb7a04b8b61d857464d1faf66ac9830 Parents: d04a9a2 Author: Don Bosco Durai Authored: Thu May 21 01:05:58 2015 -0700 Committer: Don Bosco Durai Committed: Thu May 21 01:05:58 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ranger/solr/SolrMgr.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/54caee22/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java index ee52992..2a57fa1 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java @@ -48,6 +48,8 @@ public class SolrMgr { Date lastConnectTime = null; volatile boolean initDone = false; + final static String SOLR_URLS_PROP = "ranger.audit.solr.urls"; + public SolrMgr() { } @@ -58,16 +60,22 @@ public class SolrMgr { if (!initDone) { if (rangerBizUtil.getAuditDBType().equalsIgnoreCase("solr")) { String solrURL = PropertiesUtil - .getProperty("ranger.audit.solr.urls"); + .getProperty(SOLR_URLS_PROP); if (solrURL == null) { - //Let's try older property name + // Try with url + solrURL = PropertiesUtil + .getProperty("ranger.audit.solr.url"); + } + if (solrURL == null) { + // Let's try older property name solrURL = PropertiesUtil .getProperty("ranger.solr.url"); } if (solrURL == null || solrURL.isEmpty() || solrURL.equalsIgnoreCase("none")) { - logger.fatal("Solr URL for Audit is empty"); + logger.fatal("Solr URL for Audit is empty. Please set property " + + SOLR_URLS_PROP); } else { try { solrClient = new HttpSolrClient(solrURL);