You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2017/01/19 15:29:05 UTC
[1/2] incubator-ranger git commit: Revert
37035c36725a04a1f63a776c3037000e803672ca
Repository: incubator-ranger
Updated Branches:
refs/heads/master e024d3cd3 -> 1f855bcf9
Revert 37035c36725a04a1f63a776c3037000e803672ca
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/1796bc1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/1796bc1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/1796bc1f
Branch: refs/heads/master
Commit: 1796bc1f1d4ddd577f8ca8a515b16685c64ad955
Parents: e024d3c
Author: Velmurugan Periasamy <ve...@apache.org>
Authored: Thu Jan 19 10:26:39 2017 -0500
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Thu Jan 19 10:26:39 2017 -0500
----------------------------------------------------------------------
.../ranger/server/tomcat/EmbeddedServer.java | 45 ++++++++++----------
1 file changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1796bc1f/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 4ce69e5..a1468ff 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -87,7 +87,8 @@ public class EmbeddedServer {
String logDir = null;
logDir = getConfig("logdir");
- if(logDir == null) {
+ if(logDir == null)
+ {
logDir = getConfig("kms.log.dir");
}
String hostName = getConfig("ranger.service.host");
@@ -212,7 +213,7 @@ public class EmbeddedServer {
lce.printStackTrace();
}
- if (getConfig("logdir") != null) {
+ if(getConfig("logdir") != null){
String keytab = getConfig(ADMIN_USER_KEYTAB);
// String principal = getConfig(ADMIN_USER_PRINCIPAL);
String principal = null;
@@ -222,32 +223,32 @@ public class EmbeddedServer {
// do nothing
}
String nameRules = getConfig(ADMIN_NAME_RULES);
- if (getConfig(AUTHENTICATION_TYPE) != null && getConfig(AUTHENTICATION_TYPE).trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
+ if(getConfig(AUTHENTICATION_TYPE) != null && getConfig(AUTHENTICATION_TYPE).trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try{
LOG.info("Provided Kerberos Credential : Principal = "+principal+" and Keytab = "+keytab);
Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
Subject.doAs(sub, new PrivilegedAction<Void>() {
@Override
public Void run() {
- LOG.info("Starting Server using kerberos credential");
+ LOG.info("Starting Server using kerberos crendential");
startServer(server);
return null;
}
});
- } catch(Exception e) {
+ }catch(Exception e){
LOG.severe("Tomcat Server failed to start:" + e.toString());
e.printStackTrace();
}
- } else {
+ }else{
startServer(server);
}
- } else {
+ }else{
startServer(server);
}
}
private void startServer(final Tomcat server) {
- try {
+ try{
server.start();
server.getServer().await();
shutdownServer();
@@ -407,31 +408,31 @@ public class EmbeddedServer {
long ret = 0;
String retStr = getConfig(key);
if (retStr == null) {
- ret = defaultValue;
+ ret = defaultValue;
} else {
- ret = Long.parseLong(retStr);
+ ret = Long.parseLong(retStr);
}
return ret;
}
public void updateHttpConnectorAttribConfig(Tomcat server) {
- server.getConnector().setAllowTrace(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.allowTrace", "false")));
+ server.getConnector().setAllowTrace(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.allowTrace","false")));
server.getConnector().setAsyncTimeout(getLongConfig("ranger.service.http.connector.attrib.asyncTimeout", 10000));
- server.getConnector().setEnableLookups(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.enableLookups", "false")));
+ server.getConnector().setEnableLookups(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.enableLookups","false")));
server.getConnector().setMaxHeaderCount(getIntConfig("ranger.service.http.connector.attrib.maxHeaderCount", 100));
server.getConnector().setMaxParameterCount(getIntConfig("ranger.service.http.connector.attrib.maxParameterCount", 10000));
server.getConnector().setMaxPostSize(getIntConfig("ranger.service.http.connector.attrib.maxPostSize", 2097152));
server.getConnector().setMaxSavePostSize(getIntConfig("ranger.service.http.connector.attrib.maxSavePostSize", 4096));
server.getConnector().setParseBodyMethods(getConfig("ranger.service.http.connector.attrib.methods", "POST"));
- Iterator<Object> iterator = serverConfigProperties.keySet().iterator();
- String key = null;
- String property = null;
- while (iterator.hasNext()) {
- key = iterator.next().toString();
- if (key!=null && key.startsWith("ranger.service.http.connector.property.")) {
- property = key.replace("ranger.service.http.connector.property.","");
- server.getConnector().setProperty(property, getConfig(key));
- LOG.info(property + ":" + server.getConnector().getProperty(property));
- }
+ Iterator<Object> iterator=serverConfigProperties.keySet().iterator();
+ String key=null;
+ String property=null;
+ while (iterator.hasNext()){
+ key=iterator.next().toString();
+ if(key!=null && key.startsWith("ranger.service.http.connector.property.")){
+ property=key.replace("ranger.service.http.connector.property.","");
+ server.getConnector().setProperty(property,getConfig(key));
+ LOG.info(property+":"+server.getConnector().getProperty(property));
+ }
}
}
}
[2/2] incubator-ranger git commit: Revert
92200a5f1feff2bea850a750b189b6b15b96c2fa
Posted by ve...@apache.org.
Revert 92200a5f1feff2bea850a750b189b6b15b96c2fa
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/1f855bcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/1f855bcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/1f855bcf
Branch: refs/heads/master
Commit: 1f855bcf94522f1c492859de92ce0ec7087e88ca
Parents: 1796bc1
Author: Velmurugan Periasamy <ve...@apache.org>
Authored: Thu Jan 19 10:26:51 2017 -0500
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Thu Jan 19 10:26:51 2017 -0500
----------------------------------------------------------------------
.../ranger/server/tomcat/EmbeddedServer.java | 53 +++++++++++++-------
1 file changed, 35 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1f855bcf/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index a1468ff..7ebba8a 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -154,6 +154,7 @@ public class EmbeddedServer {
valve.setEnabled(true);
valve.setFileDateFormat(getConfig("ranger.accesslog.dateformat", "yyyy-MM-dd.HH"));
valve.setDirectory(logDirectory.getAbsolutePath());
+ valve.setRotatable(true);
valve.setSuffix(".log");
String logPattern = getConfig("ranger.accesslog.pattern", "%h %l %u %t \"%r\" %s %b");
@@ -230,8 +231,18 @@ public class EmbeddedServer {
Subject.doAs(sub, new PrivilegedAction<Void>() {
@Override
public Void run() {
- LOG.info("Starting Server using kerberos crendential");
- startServer(server);
+ try{
+ LOG.info("Starting Server using kerberos crendential");
+ server.start();
+ server.getServer().await();
+ shutdownServer();
+ }catch (LifecycleException e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ }catch (Exception e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ }
return null;
}
});
@@ -240,24 +251,30 @@ public class EmbeddedServer {
e.printStackTrace();
}
}else{
- startServer(server);
+ try{
+ server.start();
+ server.getServer().await();
+ shutdownServer();
+ } catch (LifecycleException e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ } catch (Exception e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ }
}
}else{
- startServer(server);
- }
- }
-
- private void startServer(final Tomcat server) {
- try{
- server.start();
- server.getServer().await();
- shutdownServer();
- } catch (LifecycleException e) {
- LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
- } catch (Exception e) {
- LOG.severe("Tomcat Server failed to start:" + e.toString());
- e.printStackTrace();
+ try{
+ server.start();
+ server.getServer().await();
+ shutdownServer();
+ } catch (LifecycleException e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ } catch (Exception e) {
+ LOG.severe("Tomcat Server failed to start:" + e.toString());
+ e.printStackTrace();
+ }
}
}