Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
log database info before liquibase gets run
  • Loading branch information
Patrick Huang committed Sep 15, 2016
1 parent 55f5e82 commit f86b0d5
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 33 deletions.
10 changes: 0 additions & 10 deletions zanata-war/src/main/java/org/zanata/ZanataInit.java
Expand Up @@ -67,8 +67,6 @@
import org.zanata.rest.dto.VersionInfo;
import javax.enterprise.event.Event;
import org.zanata.util.VersionUtility;
import org.zanata.util.ZanataDatabaseDriverMetadata;
import org.zanata.util.ZanataDatabaseMetaData;

/**
* This class handles various tasks at startup. It disables warnings for a
Expand Down Expand Up @@ -104,12 +102,6 @@ public class ZanataInit {
@Inject
private ApplicationConfiguration applicationConfiguration;

@Inject
private ZanataDatabaseDriverMetadata databaseDriverMetadata;

@Inject
private ZanataDatabaseMetaData databaseMetaData;

@Inject
private Event<ServerStarted> startupEvent;

Expand Down Expand Up @@ -447,8 +439,6 @@ private void logBanner(VersionInfo ver) {
log.info(" #(((((((((((# ((# ");
log.info("");
log.info(" Zanata version: " + ver.getVersionNo());
log.info(" Database: {}", databaseMetaData);
log.info(" JDBC Driver: {}", databaseDriverMetadata);
log.info(" SCM: " + ver.getScmDescribe());
log.info(" Red Hat Inc 2008-{}",
Calendar.getInstance().get(Calendar.YEAR));
Expand Down
Expand Up @@ -23,17 +23,20 @@
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import javax.annotation.Resource;
import javax.enterprise.inject.Produces;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.sql.DataSource;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zanata.util.ZanataDatabaseDriverMetadata;
import org.zanata.util.ZanataDatabaseMetaData;
import org.zanata.util.DatabaseDriverVersionInfo;
import org.zanata.util.DatabaseVersionInfo;

/**
* Log database and database driver information at context start time.
* This listener should appear before liquibase listener so that if liquibase
* run into any error we can use this information for troubleshooting.
*
* @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
*/
public class ZanataDatabaseMetadataServletListener implements
Expand All @@ -43,8 +46,6 @@ public class ZanataDatabaseMetadataServletListener implements

@Resource(lookup = "java:jboss/datasources/zanataDatasource")
private DataSource dataSource;
private static ZanataDatabaseMetaData databaseMetaData;
private static ZanataDatabaseDriverMetadata dbDriverMetaData;

@Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
Expand All @@ -58,26 +59,23 @@ public void contextInitialized(ServletContextEvent servletContextEvent) {
String dbVersion =
metaData.getDatabaseProductVersion();

databaseMetaData = new ZanataDatabaseMetaData(dbProductName,
dbMajorVer, dbMinorVer, dbVersion); ;
dbDriverMetaData = new ZanataDatabaseDriverMetadata(
metaData.getDriverName(), metaData.getDriverVersion());
DatabaseVersionInfo databaseMetaData =
new DatabaseVersionInfo(dbProductName,
dbMajorVer, dbMinorVer, dbVersion);
DatabaseDriverVersionInfo dbDriverMetaData =
new DatabaseDriverVersionInfo(
metaData.getDriverName(),
metaData.getDriverVersion());

log.info("===================================");
log.info(" Database: {}", databaseMetaData);
log.info(" JDBC Driver: {}", dbDriverMetaData);
log.info("===================================");
} catch (Exception e) {
log.warn("fail on getting database metadata", e);
}
}

@Produces
ZanataDatabaseMetaData databaseMetaData() {
return databaseMetaData;
}

@Produces
ZanataDatabaseDriverMetadata databaseDriverMetadata() {
return dbDriverMetaData;
}

@Override
public void contextDestroyed(ServletContextEvent servletContextEvent) {
}
Expand Down
Expand Up @@ -26,11 +26,11 @@
* @author Patrick Huang <a
* href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
*/
public class ZanataDatabaseDriverMetadata {
public class DatabaseDriverVersionInfo {
private final String name;
private final String version;

public ZanataDatabaseDriverMetadata(String name, String version) {
public DatabaseDriverVersionInfo(String name, String version) {
this.name = name;
this.version = version;
}
Expand Down
Expand Up @@ -26,13 +26,13 @@
* @author Patrick Huang <a
* href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
*/
public class ZanataDatabaseMetaData {
public class DatabaseVersionInfo {
private final String name;
private final int majorVersion;
private final int minorVersion;
private final String version;

public ZanataDatabaseMetaData(String name, int majorVersion,
public DatabaseVersionInfo(String name, int majorVersion,
int minorVersion,
String version) {
this.name = name;
Expand Down

0 comments on commit f86b0d5

Please sign in to comment.