[Minor] Code cleanup

This commit is contained in:
Robert von Burg 2016-10-03 14:00:39 +02:00
parent 61b3a3e5bf
commit 597441653a
3 changed files with 35 additions and 27 deletions

View File

@ -37,16 +37,20 @@ public class StartupListener implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
try {
String realPath = sce.getServletContext().getRealPath("/WEB-INF");
String realPath = sce.getServletContext().getRealPath("/WEB-INF"); File pathF = new File(realPath);
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF);
File pathF = new File(realPath); logger.info("Starting Agent...");
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF); this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF);
logger.info("Starting Agent..."); this.agent.initialize();
this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF); this.agent.start();
this.agent.initialize(); logger.info("Agent started.");
this.agent.start(); } catch (Exception e) {
logger.info("Agent started."); logger.error("Server startup failed due to: " + e.getMessage(), e);
throw e;
}
} }
@Override @Override

View File

@ -37,16 +37,20 @@ public class StartupListener implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
try {
String realPath = sce.getServletContext().getRealPath("/WEB-INF");
String realPath = sce.getServletContext().getRealPath("/WEB-INF"); File pathF = new File(realPath);
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF);
File pathF = new File(realPath); logger.info("Starting Agent...");
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF); this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF);
logger.info("Starting Agent..."); this.agent.initialize();
this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF); this.agent.start();
this.agent.initialize(); logger.info("Agent started.");
this.agent.start(); } catch (Exception e) {
logger.info("Agent started."); logger.error("Server startup failed due to: " + e.getMessage(), e);
throw e;
}
} }
@Override @Override

View File

@ -22,22 +22,22 @@ public class StartupListener implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
String realPath = sce.getServletContext().getRealPath("/WEB-INF");
File pathF = new File(realPath);
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF);
logger.info("Starting Strolch Minimal Rest...");
try { try {
String realPath = sce.getServletContext().getRealPath("/WEB-INF");
File pathF = new File(realPath);
String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF);
logger.info("Starting Strolch Minimal Rest...");
this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF); this.agent = new StrolchBootstrapper(StartupListener.class).setupByRoot(environment, pathF);
this.agent.initialize(); this.agent.initialize();
this.agent.start(); this.agent.start();
logger.info("Started Strolch Minimal Rest.");
} catch (Exception e) { } catch (Exception e) {
logger.error("Failed to start Strolch due to: " + e.getMessage(), e); logger.error("Server startup failed due to: " + e.getMessage(), e);
throw e; throw e;
} }
logger.info("Started Strolch Minimal Rest.");
} }
@Override @Override