Repository: incubator-ranger Updated Branches: refs/heads/master ec749f09e -> b744c8eb6
RANGER-975: Rename ranger log file from xa_portal.log to ranger_admin.log Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b744c8eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b744c8eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b744c8eb Branch: refs/heads/master Commit: b744c8eb6659f319e3d25fa09f010ceb6a667452 Parents: ec749f0 Author: Gautam Borad <[email protected]> Authored: Fri Apr 29 15:59:23 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Tue May 10 07:24:26 2016 +0530 ---------------------------------------------------------------------- .../java/org/apache/ranger/plugin/client/BaseClient.java | 2 +- .../apache/ranger/services/hbase/client/HBaseClient.java | 8 ++++---- .../apache/ranger/services/hdfs/client/HdfsClient.java | 4 ++-- .../apache/ranger/services/hive/client/HiveClient.java | 10 +++++----- .../apache/ranger/services/knox/client/KnoxClient.java | 10 +++++----- .../org/apache/ranger/services/kms/client/KMSClient.java | 2 +- .../apache/ranger/services/yarn/client/YarnClient.java | 2 +- .../main/java/org/apache/ranger/common/TimedExecutor.java | 2 +- security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml | 2 +- security-admin/src/main/webapp/WEB-INF/log4j.dev.xml | 4 ++-- security-admin/src/main/webapp/WEB-INF/log4j.properties | 4 ++-- security-admin/src/main/webapp/WEB-INF/log4j.xml | 4 ++-- .../apache/ranger/services/storm/client/StormClient.java | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java index 86a91a4..171575d 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java @@ -73,7 +73,7 @@ public abstract class BaseClient { ClassLoader prevCl = Thread.currentThread().getContextClassLoader() ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; try { //Thread.currentThread().setContextClassLoader(configHolder.getClassLoader()); String lookupPrincipal = SecureClientLogin.getPrincipal(configHolder.getLookupPrincipal(), java.net.InetAddress.getLocalHost().getCanonicalHostName()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java index 1979905..e5d3a84 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java +++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java @@ -96,7 +96,7 @@ public class HBaseClient extends BaseClient { HashMap<String, Object> responseData = new HashMap<String, Object>(); final String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; boolean connectivityStatus = false; HBaseClient connectionObj = new HBaseClient(dataSource, @@ -127,7 +127,7 @@ public class HBaseClient extends BaseClient { subj = getLoginSubject(); final String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if (subj != null) { try { @@ -232,7 +232,7 @@ public class HBaseClient extends BaseClient { List<String> ret = null ; final String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; subj = getLoginSubject(); @@ -334,7 +334,7 @@ public class HBaseClient extends BaseClient { List<String> ret = null ; final String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; subj = getLoginSubject(); if (subj != null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java index 4d563a3..bc98d24 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java @@ -68,7 +68,7 @@ public class HdfsClient extends BaseClient { List<String> fileList = new ArrayList<String>() ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; try { String dirPrefix = (baseDir.endsWith("/") ? baseDir : (baseDir + "/")) ; String filterRegEx = null; @@ -242,7 +242,7 @@ public class HdfsClient extends BaseClient { testconnMsg = "Unable to retrieve any files using given parameters, " + "You can still save the repository and start creating policies, " + "but you would not be able to use autocomplete for resource names. " - + "Check xa_portal.log for more info. "; + + "Check ranger_admin.log for more info. "; String additionalMsg = (validateConfigsMsg != null) ? validateConfigsMsg : testconnMsg; generateResponseDataMap(connectivityStatus, testconnMsg, additionalMsg, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java index e38c26c..b9dd949 100644 --- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java +++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java @@ -109,7 +109,7 @@ public class HiveClient extends BaseClient implements Closeable { List<String> ret = new ArrayList<String>() ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if (con != null) { Statement stat = null ; ResultSet rs = null ; @@ -191,7 +191,7 @@ public class HiveClient extends BaseClient implements Closeable { List<String> ret = new ArrayList<String>() ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if (con != null) { Statement stat = null ; ResultSet rs = null ; @@ -304,7 +304,7 @@ public class HiveClient extends BaseClient implements Closeable { List<String> ret = new ArrayList<String>() ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if (con != null) { String columnNameMatchingRegEx = null ; @@ -443,7 +443,7 @@ public class HiveClient extends BaseClient implements Closeable { String url = prop.getProperty("jdbc.url") ; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if (driverClassName != null) { try { @@ -627,7 +627,7 @@ public class HiveClient extends BaseClient implements Closeable { boolean connectivityStatus = false; String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; List<String> testResult = null; try { connectionObj = new HiveClient(serviceName, connectionProperties); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java index 8af77b2..f2bb9dd 100644 --- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java +++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java @@ -69,7 +69,7 @@ public class KnoxClient { List<String> topologyList = new ArrayList<String>(); String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if ( topologyNameMatching == null || topologyNameMatching.trim().isEmpty()) { topologyNameMatching = ""; } @@ -160,7 +160,7 @@ public class KnoxClient { List<String> serviceList = new ArrayList<String>(); String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if ( serviceNameMatching == null || serviceNameMatching.trim().isEmpty()) { serviceNameMatching = ""; } @@ -280,7 +280,7 @@ public class KnoxClient { String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; boolean connectivityStatus = false; HashMap<String, Object> responseData = new HashMap<String, Object>(); @@ -313,7 +313,7 @@ public class KnoxClient { } String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; if ( configs != null && !configs.isEmpty()) { String knoxUrl = configs.get("knox.url"); String knoxAdminUser = configs.get("username"); @@ -337,7 +337,7 @@ public class KnoxClient { List<String> resultList = new ArrayList<String>(); String errMsg = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; try { if (knoxClient == null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java ---------------------------------------------------------------------- diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java index 271392b..218d1e3 100755 --- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java +++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java @@ -61,7 +61,7 @@ public class KMSClient { private static final String errMessage = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; private static final String AUTH_TYPE_KERBEROS = "kerberos"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java ---------------------------------------------------------------------- diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java index 0c7bcad..7cde870 100644 --- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java +++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java @@ -50,7 +50,7 @@ public class YarnClient extends BaseClient { private static final String errMessage = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; String yarnQUrl; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java index ca2e2dc..071948e 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java +++ b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java @@ -121,7 +121,7 @@ public class TimedExecutor { String msgDesc = "Unable to retrieve any files using given parameters, " + "You can still save the repository and start creating policies, " + "but you would not be able to use autocomplete for resource names. " - + "Check xa_portal.log for more info. "; + + "Check ranger_admin.log for more info. "; HadoopException hpe = new HadoopException(e.getMessage(), e); hpe.generateResponseDataMap(false, hpe.getMessage(e), msgDesc, null, null); return hpe; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml b/security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml index 1aafb07..19485cd 100644 --- a/security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml +++ b/security-admin/src/main/webapp/WEB-INF/db_patch.log4j.xml @@ -29,7 +29,7 @@ </appender> <appender name="sql_appender" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="${logdir}/xa_portal_sql_db_patch.log" /> + <param name="file" value="${logdir}/ranger_admin_sql_db_patch.log" /> <param name="datePattern" value="'.'yyyy-MM-dd" /> <param name="append" value="true" /> <layout class="org.apache.log4j.PatternLayout"> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/security-admin/src/main/webapp/WEB-INF/log4j.dev.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/log4j.dev.xml b/security-admin/src/main/webapp/WEB-INF/log4j.dev.xml index d1c8b79..45ca923 100644 --- a/security-admin/src/main/webapp/WEB-INF/log4j.dev.xml +++ b/security-admin/src/main/webapp/WEB-INF/log4j.dev.xml @@ -28,7 +28,7 @@ </appender> <!-- <appender name="daily_rolling_file" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="/xa_portal.log" /> + <param name="file" value="/ranger_admin.log" /> <param name="datePattern" value="'.'yyyy-MM-dd" /> <param name="append" value="true" /> <layout class="org.apache.log4j.PatternLayout"> @@ -36,7 +36,7 @@ </layout> </appender> <appender name="sql_daily_rolling_file" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="xa_portal_sql.log" /> + <param name="file" value="ranger_admin_sql.log" /> <param name="datePattern" value="'.'yyyy-MM-dd" /> <param name="append" value="true" /> <layout class="org.apache.log4j.PatternLayout"> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/security-admin/src/main/webapp/WEB-INF/log4j.properties ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/log4j.properties b/security-admin/src/main/webapp/WEB-INF/log4j.properties index 08ac852..211de86 100644 --- a/security-admin/src/main/webapp/WEB-INF/log4j.properties +++ b/security-admin/src/main/webapp/WEB-INF/log4j.properties @@ -22,7 +22,7 @@ log4j.rootLogger = warn,xa_log_appender # xa_logger log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.xa_log_appender.file=${logdir}/xa_portal.log +log4j.appender.xa_log_appender.file=${logdir}/ranger_admin.log log4j.appender.xa_log_appender.datePattern='.'yyyy-MM-dd log4j.appender.xa_log_appender.append=true log4j.appender.xa_log_appender.layout=org.apache.log4j.PatternLayout @@ -48,7 +48,7 @@ log4j.appender.perf_appender.layout.ConversionPattern=%d [%t] %m%n # sql_appender log4j.appender.sql_appender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.sql_appender.file=${logdir}/xa_portal_sql.log +log4j.appender.sql_appender.file=${logdir}/ranger_admin_sql.log log4j.appender.sql_appender.datePattern='.'yyyy-MM-dd log4j.appender.sql_appender.append=true log4j.appender.sql_appender.layout=org.apache.log4j.PatternLayout http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/security-admin/src/main/webapp/WEB-INF/log4j.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/log4j.xml b/security-admin/src/main/webapp/WEB-INF/log4j.xml index f7d40bb..54abd06 100644 --- a/security-admin/src/main/webapp/WEB-INF/log4j.xml +++ b/security-admin/src/main/webapp/WEB-INF/log4j.xml @@ -20,7 +20,7 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> <appender name="xa_log_appender" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="${logdir}/xa_portal.log" /> + <param name="file" value="${logdir}/ranger_admin.log" /> <param name="datePattern" value="'.'yyyy-MM-dd" /> <param name="append" value="true" /> <layout class="org.apache.log4j.PatternLayout"> @@ -38,7 +38,7 @@ </appender> <appender name="sql_appender" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="${logdir}/xa_portal_sql.log" /> + <param name="file" value="${logdir}/ranger_admin_sql.log" /> <param name="datePattern" value="'.'yyyy-MM-dd" /> <param name="append" value="true" /> <layout class="org.apache.log4j.PatternLayout"> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b744c8eb/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java index 432ed78..9e15714 100644 --- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java +++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java @@ -59,7 +59,7 @@ public class StormClient { private static final String errMessage = " You can still save the repository and start creating " + "policies, but you would not be able to use autocomplete for " - + "resource names. Check xa_portal.log for more info."; + + "resource names. Check ranger_admin.log for more info."; String stormUIUrl; String userName;
