Author: bleny Date: 2013-03-29 15:06:19 +0100 (Fri, 29 Mar 2013) New Revision: 61 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add logs when starting stopping magalie Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,13 @@ package com.franciaflex.magalie; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -24,8 +26,15 @@ } catch (ArgumentsParserException e) { throw new MagalieTechnicalException(e); } - if (log.isDebugEnabled()) { - log.debug("parsed options in config file" + applicationConfig.getOptions()); + if (log.isInfoEnabled()) { + StringBuilder builder = new StringBuilder(); + List<MagalieConfigOption> options = Lists.newArrayList(MagalieConfigOption.values()); + for (MagalieConfigOption option : options) { + builder.append(String.format("\n%1$-40s = %2$s", + option.getKey(), + applicationConfig.getOption(option))); + } + log.info("MagaLiE configuration:\n" + builder.toString()); } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,14 @@ package com.franciaflex.magalie.web; import com.franciaflex.magalie.MagalieApplicationConfig; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.web.filter.JpaTransactionFilter; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; +import javax.persistence.PersistenceException; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -13,6 +16,8 @@ public class MagalieJpaTransactionFilter extends JpaTransactionFilter { + private static final Log log = LogFactory.getLog(MagalieJpaTransactionFilter.class); + protected EntityManagerFactory entityManagerFactory; @Override @@ -20,19 +25,52 @@ super.init(filterConfig); + if (log.isInfoEnabled()) { + log.info("start MagaLiE application"); + } + MagalieApplicationConfig applicationConfig = new MagalieApplicationConfig(); Map<String, String> jpaParameters = applicationConfig.getJpaParameters(); - entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + if (log.isInfoEnabled()) { + log.info("creating entity manager factory"); + } + try { + + entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager factory", e); + } + + throw e; + + } } @Override protected EntityManager createEntityManager(ServletRequest request) { - EntityManager entityManager = entityManagerFactory.createEntityManager(); + EntityManager entityManager; + try { + + entityManager = entityManagerFactory.createEntityManager(); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager", e); + } + + throw e; + + } + return entityManager; } @@ -40,7 +78,14 @@ @Override public void destroy() { + if (log.isInfoEnabled()) { + log.info("stopping magalie, will close entity manager factory"); + } + entityManagerFactory.close(); + if (log.isInfoEnabled()) { + log.info("stopping MagaLiE"); + } } }
participants (1)
-
bleny@users.forge.codelutin.com