First pass at Symmetric Logger with internationalization.

JumpMind · Aug 15, 2009 · 7eec56e · 7eec56e
1 parent 4224153
commit 7eec56e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java
@@ -30,8 +30,8 @@
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.jumpmind.symmetric.common.logging.Log;
+import org.jumpmind.symmetric.common.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.ConnectionCallback;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -85,7 +85,7 @@ private void closeQuietly(Statement stmt) {
             try {
                 stmt.close();
             } catch (SQLException e) {
-                logger.error(e, e);
+                logger.error(e);
             }
         }
     }
@@ -106,7 +106,7 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc
                 Statement st = null;
                 String fileName = script.getFile();
                 fileName = fileName.substring(fileName.lastIndexOf("/") + 1);
-                logger.info("Running " + fileName);
+                logger.info("ScriptRunning", fileName);
                 int lineCount = 0;
 
                 try {
@@ -124,9 +124,7 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc
                             if (checkStatementEnds(line)) {
                                 sql.append(" ");
                                 sql.append(line.substring(0, line.lastIndexOf(delimiter)));
-                                if (logger.isDebugEnabled()) {
-                                    logger.debug("query->" + sql);
-                                }
+                                logger.debug("Sql", sql);
                                 try {
                                     st.execute(replaceTokens(sql.toString()));
                                     count++;
@@ -135,11 +133,11 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc
                                     }
                                 } catch (SQLException e) {
                                     if (failOnError) {
-                                        logger.error(sql.toString() + " failed to execute.", e);
+                                        logger.error("SqlError", sql.toString(), e);
                                         throw e;
                                     } else {
                                         if (e.getErrorCode() != 942 && e.getErrorCode() != 2289) {
-                                            logger.warn(e.getMessage() + ": " + sql.toString());
+                                            logger.warn("Sql", e.getMessage() + ": " + sql.toString());
                                         } else if (sql.toString().toLowerCase().startsWith("drop")) {
                                             notFoundCount++;
                                         }
@@ -155,13 +153,12 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc
 
                     connection.commit();
 
-                    logger.info("Ran " + count + " sql statements in " + fileName);
+                    logger.info("ScriptCompleted", count, fileName);
                     if (notFoundCount > 0) {
-                        logger.info("Could not drop a total of " + notFoundCount
-                                + " database object because they were not found");
+                        logger.info("ScriptDropError", notFoundCount);
                     }
                 } catch (Exception e) {
-                    logger.info("Error on line " + lineCount + " of " + fileName);
+                    logger.info("ScriptError", lineCount, fileName);
                     throw new RuntimeException(e);
                 } finally {
                     closeQuietly(st);

diff --git a/symmetric/src/main/resources/logMessages_en_US.properties b/symmetric/src/main/resources/logMessages_en_US.properties
@@ -11,6 +11,11 @@ FunctionInstalled=Just installed %s
 PostgreSqlCustomVariableMissing=Please add "custom_variable_classes = 'symmetric'" to your postgresql.conf file
 PostTriggerCreateFailed=Failed to create post trigger: %s
 Sql=SQL: %s
+ScriptRunning=Running %s
+ScriptCompleted=Ran %d SQL statements in %s
+ScriptError=Error on line %d of %s
+ScriptDropError=Could not drop a total of %d database objects because they were not found.
+SqlError=%s failed to execute.
 TableDropped=Just dropped table %s_CONFIG
 TablesCreating=About to create SymmetricDS tables
 TablesCreatingSkipped=No need to create SymmetricDS tables.  They already exist.