Author: sletellier Date: 2011-03-25 17:14:11 +0100 (Fri, 25 Mar 2011) New Revision: 2235 Url: http://nuiton.org/repositories/revision/topia/2235 Log: Improve logs on migrations Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -190,12 +190,13 @@ int index = 0; int max = sqls.length; for (String sql : sqls) { + index++; long t0 = System.nanoTime(); if (log.isInfoEnabled()) { String message = ""; if (showProgression) { - message = _("topia.migration.start.sql", ++index, max); + message = _("topia.migration.start.sql", index, max); } if (showSql) { message += "\n" + sql; @@ -213,7 +214,7 @@ } if (log.isDebugEnabled()) { String message; - message = _("topia.migration.end.sql", ++index, max, StringUtil.convertTime(System.nanoTime() - t0)); + message = _("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); log.debug(message); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -548,6 +548,12 @@ // recuperation de la version de la base v = getVersion(versionTableExist, TMSVersionDAO.TABLE_NAME); + + if (log.isWarnEnabled()) { + if (v == null) { + log.warn("Version not found on table " + TMSVersionDAO.TABLE_NAME); + } + } return; } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -163,8 +163,12 @@ if (set.next()) { version = VersionUtil.valueOf(set.getString(1)); } + } catch (SQLException eee) { + if (log.isErrorEnabled()) { + log.error("Could not find version", eee); + } + version = null; } finally { - st.close(); } }