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:06 UTC
[2/2] incubator-ranger git commit: Revert
92200a5f1feff2bea850a750b189b6b15b96c2fa
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();
+ }
}
}