diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/Log.java b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/CommonsResourceLog.java similarity index 62% rename from symmetric/src/main/java/org/jumpmind/symmetric/common/logging/Log.java rename to symmetric/src/main/java/org/jumpmind/symmetric/common/logging/CommonsResourceLog.java index 7a227788dc..8ca4b6eb6c 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/Log.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/CommonsResourceLog.java @@ -5,7 +5,7 @@ import java.util.ResourceBundle; import java.util.UnknownFormatConversionException; -public class Log { +public class CommonsResourceLog implements ILog { private org.apache.commons.logging.Log logger = null; @@ -17,24 +17,30 @@ public class Log { private static String MESSAGE_KEY = "MessageKey: "; private static String DEFAULT_BUNDLE_NAME = "logMessages"; - Log(org.apache.commons.logging.Log logger) { + CommonsResourceLog(org.apache.commons.logging.Log logger) { this(logger, DEFAULT_BUNDLE_NAME, Locale.getDefault()); } - Log(org.apache.commons.logging.Log logger, String bundleName) { + CommonsResourceLog(org.apache.commons.logging.Log logger, String bundleName) { this(logger, bundleName, Locale.getDefault()); } - Log(org.apache.commons.logging.Log logger, String bundleName, Locale locale) { + CommonsResourceLog(org.apache.commons.logging.Log logger, String bundleName, Locale locale) { this.logger = logger; this.bundleName = bundleName; setLocale(locale); } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#getMessage(java.lang.String) + */ public String getMessage(String key) { return getMessage(key, (Object) null); } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#getMessage(java.lang.String, java.lang.Object) + */ public String getMessage(String key, Object... args) { if (bundle != null) { try { @@ -54,10 +60,16 @@ public String getMessage(String key, Object... args) { } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#getLocale() + */ public Locale getLocale() { return locale; } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#setLocale(java.util.Locale) + */ public void setLocale(Locale locale) { this.locale = locale; try { @@ -68,10 +80,16 @@ public void setLocale(Locale locale) { } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#getBundleName() + */ public String getBundleName() { return bundleName; } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#setBundleName(java.lang.String) + */ public void setBundleName(String bundleName) { this.bundleName = bundleName; this.bundle = ResourceBundle.getBundle(bundleName, locale); @@ -79,24 +97,36 @@ public void setBundleName(String bundleName) { // Debug + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#debug(java.lang.String) + */ public void debug(String messageKey) { if (logger.isDebugEnabled()) { logger.debug(getMessage(messageKey)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#debug(java.lang.String, java.lang.Throwable) + */ public void debug(String messageKey, Throwable t) { if (logger.isDebugEnabled()) { logger.debug(getMessage(messageKey), t); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#debug(java.lang.String, java.lang.Object) + */ public void debug(String messageKey, Object... args) { if (logger.isDebugEnabled()) { logger.debug(getMessage(messageKey, args)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#debug(java.lang.String, java.lang.Throwable, java.lang.Object) + */ public void debug(String messageKey, Throwable t, Object... args) { if (logger.isDebugEnabled()) { logger.debug(getMessage(messageKey, args), t); @@ -105,24 +135,36 @@ public void debug(String messageKey, Throwable t, Object... args) { // info + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#info(java.lang.String) + */ public void info(String messageKey) { if (logger.isInfoEnabled()) { logger.info(getMessage(messageKey)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#info(java.lang.String, java.lang.Throwable) + */ public void info(String messageKey, Throwable t) { if (logger.isInfoEnabled()) { logger.info(getMessage(messageKey), t); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#info(java.lang.String, java.lang.Object) + */ public void info(String messageKey, Object... args) { if (logger.isInfoEnabled()) { logger.info(getMessage(messageKey, args)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#info(java.lang.String, java.lang.Throwable, java.lang.Object) + */ public void info(String messageKey, Throwable t, Object... args) { if (logger.isInfoEnabled()) { logger.info(getMessage(messageKey, args), t); @@ -131,24 +173,36 @@ public void info(String messageKey, Throwable t, Object... args) { // warn + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#warn(java.lang.String) + */ public void warn(String messageKey) { if (logger.isWarnEnabled()) { logger.warn(getMessage(messageKey)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#warn(java.lang.String, java.lang.Throwable) + */ public void warn(String messageKey, Throwable t) { if (logger.isWarnEnabled()) { logger.warn(getMessage(messageKey), t); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#warn(java.lang.String, java.lang.Object) + */ public void warn(String messageKey, Object... args) { if (logger.isWarnEnabled()) { logger.warn(getMessage(messageKey, args)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#warn(java.lang.String, java.lang.Throwable, java.lang.Object) + */ public void warn(String messageKey, Throwable t, Object... args) { if (logger.isWarnEnabled()) { logger.warn(getMessage(messageKey, args), t); @@ -157,24 +211,36 @@ public void warn(String messageKey, Throwable t, Object... args) { // error + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#error(java.lang.String) + */ public void error(String messageKey) { if (logger.isErrorEnabled()) { logger.error(getMessage(messageKey)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#error(java.lang.String, java.lang.Throwable) + */ public void error(String messageKey, Throwable t) { if (logger.isErrorEnabled()) { logger.error(getMessage(messageKey), t); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#error(java.lang.String, java.lang.Object) + */ public void error(String messageKey, Object... args) { if (logger.isErrorEnabled()) { logger.error(getMessage(messageKey, args)); } } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#error(java.lang.String, java.lang.Throwable, java.lang.Object) + */ public void error(String messageKey, Throwable t, Object... args) { if (logger.isErrorEnabled()) { logger.error(getMessage(messageKey, args), t); @@ -182,6 +248,9 @@ public void error(String messageKey, Throwable t, Object... args) { } + /* (non-Javadoc) + * @see org.jumpmind.symmetric.common.logging.ILog#error(java.lang.Throwable) + */ public void error(Throwable t) { if (logger.isErrorEnabled()) { logger.error(t,t); diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/ILog.java b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/ILog.java new file mode 100644 index 0000000000..9a43e9765e --- /dev/null +++ b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/ILog.java @@ -0,0 +1,53 @@ +package org.jumpmind.symmetric.common.logging; + +import java.util.Locale; + +public interface ILog { + + public abstract String getMessage(String key); + + public abstract String getMessage(String key, Object... args); + + public abstract Locale getLocale(); + + public abstract void setLocale(Locale locale); + + public abstract String getBundleName(); + + public abstract void setBundleName(String bundleName); + + public abstract void debug(String messageKey); + + public abstract void debug(String messageKey, Throwable t); + + public abstract void debug(String messageKey, Object... args); + + public abstract void debug(String messageKey, Throwable t, Object... args); + + public abstract void info(String messageKey); + + public abstract void info(String messageKey, Throwable t); + + public abstract void info(String messageKey, Object... args); + + public abstract void info(String messageKey, Throwable t, Object... args); + + public abstract void warn(String messageKey); + + public abstract void warn(String messageKey, Throwable t); + + public abstract void warn(String messageKey, Object... args); + + public abstract void warn(String messageKey, Throwable t, Object... args); + + public abstract void error(String messageKey); + + public abstract void error(String messageKey, Throwable t); + + public abstract void error(String messageKey, Object... args); + + public abstract void error(String messageKey, Throwable t, Object... args); + + public abstract void error(Throwable t); + +} \ No newline at end of file diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/LogFactory.java b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/LogFactory.java index 72cf18c995..7454982772 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/LogFactory.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/common/logging/LogFactory.java @@ -5,7 +5,7 @@ public class LogFactory { @SuppressWarnings("unchecked") - public static Log getLog(Class clazz) throws LogConfigurationException { - return new Log(org.apache.commons.logging.LogFactory.getLog(clazz)); + public static ILog getLog(Class clazz) throws LogConfigurationException { + return new CommonsResourceLog(org.apache.commons.logging.LogFactory.getLog(clazz)); } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/config/DynamicPropertiesFiles.java b/symmetric/src/main/java/org/jumpmind/symmetric/config/DynamicPropertiesFiles.java index e59ad6554a..2eb02c9e60 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/config/DynamicPropertiesFiles.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/config/DynamicPropertiesFiles.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.apache.commons.lang.StringUtils; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; /** @@ -35,7 +35,7 @@ public class DynamicPropertiesFiles extends ArrayList { private static final long serialVersionUID = 1L; - private static Log logger = LogFactory.getLog(DynamicPropertiesFiles.class); + private static ILog log = LogFactory.getLog(DynamicPropertiesFiles.class); public DynamicPropertiesFiles() { File file = new File(System.getProperty("user.dir"), "symmetric.properties"); @@ -43,7 +43,7 @@ public DynamicPropertiesFiles() { try { add(file.toURL().toExternalForm()); } catch (MalformedURLException e) { - logger.error(e); + log.error(e); } } if (!StringUtils.isBlank(System.getProperty("symmetric.override.properties.file.1"))) { diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java index 1a33e38a05..c19da9d3fe 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java @@ -68,7 +68,7 @@ import org.apache.ddlutils.platform.DatabaseMetaDataWrapper; import org.apache.ddlutils.platform.MetaDataColumnDescriptor; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.mssql.MsSqlDbDialect; import org.jumpmind.symmetric.load.IColumnFilter; @@ -99,7 +99,7 @@ abstract public class AbstractDbDialect implements IDbDialect { public static final String[] TIME_PATTERNS = { "HH:mm:ss.S", "HH:mm:ss", "yyyy-MM-dd HH:mm:ss.S", "yyyy-MM-dd HH:mm:ss" }; - protected final Log logger = LogFactory.getLog(getClass()); + protected final ILog log = LogFactory.getLog(getClass()); public static final int MAX_SYMMETRIC_SUPPORTED_TRIGGER_SIZE = 50; @@ -219,7 +219,7 @@ final public boolean doesTriggerExist(String catalogName, String schema, String try { return doesTriggerExistOnPlatform(catalogName, schema, tableName, triggerName); } catch (Exception ex) { - logger.warn("TriggerMayExist", ex); + log.warn("TriggerMayExist", ex); return false; } } @@ -230,7 +230,7 @@ protected void createRequiredFunctions() { String funcName = tablePrefix + "_" + functions[i]; if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcName, defaultSchema)) == 0) { jdbcTemplate.update(sqlTemplate.getFunctionSql(functions[i], funcName, defaultSchema)); - logger.info("FunctionInstalled", funcName); + log.info("FunctionInstalled", funcName); } } } @@ -648,7 +648,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc try { jdbcTemplate.update(sql); } catch (Exception e) { - logger.warn("TriggerDoesNotExist"); + log.warn("TriggerDoesNotExist"); } } } @@ -670,7 +670,7 @@ public void initTrigger(final StringBuilder sqlBuffer, final DataEventType dml, jdbcTemplate.execute(new ConnectionCallback() { public Object doInConnection(Connection con) throws SQLException, DataAccessException { String sourceCatalogName = trigger.getSourceCatalogName(); - logger.info("TriggerCreating", hist.getTriggerNameForDmlType(dml), + log.info("TriggerCreating", hist.getTriggerNameForDmlType(dml), (sourceCatalogName != null ? (sourceCatalogName + ".") : ""), trigger.getSourceTableName()); String previousCatalog = null; @@ -685,10 +685,10 @@ public Object doInConnection(Connection con) throws SQLException, DataAccessExce if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) { Statement stmt = con.createStatement(); try { - logger.debug("Sql",triggerSql); + log.debug("Sql",triggerSql); stmt.executeUpdate(triggerSql); } catch (SQLException ex) { - logger.error("TriggerCreateFailed", triggerSql); + log.error("TriggerCreateFailed", triggerSql); throw ex; } String postTriggerDml = createPostTriggerDDL(dml, trigger, hist, tablePrefix, table); @@ -696,7 +696,7 @@ public Object doInConnection(Connection con) throws SQLException, DataAccessExce try { stmt.executeUpdate(postTriggerDml); } catch (SQLException ex) { - logger.error("PostTriggerCreateFailed", postTriggerDml); + log.error("PostTriggerCreateFailed", postTriggerDml); throw ex; } } @@ -796,10 +796,10 @@ protected void addPrefixAndCreateTablesIfNecessary(Database targetTables) { try { boolean createTables = prefixConfigDatabase(targetTables); if (createTables) { - logger.info("TablesCreating"); + log.info("TablesCreating"); platform.createTables(targetTables, false, true); } else { - logger.info("TablesCreatingSkipped"); + log.info("TablesCreatingSkipped"); } } catch (RuntimeException ex) { throw ex; @@ -1216,7 +1216,7 @@ public String getTriggerName(DataEventType dml, String triggerPrefix, int maxTri if (triggerName.length() > maxTriggerNameLength && maxTriggerNameLength > 0) { triggerName = triggerName.substring(0, maxTriggerNameLength - 1); - logger.warn("TriggerNameTruncated", dml.name().toLowerCase(), trigger.getTriggerId(), maxTriggerNameLength); + log.warn("TriggerNameTruncated", dml.name().toLowerCase(), trigger.getTriggerId(), maxTriggerNameLength); } return triggerName; } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java index 9646882e49..da1ad0b6cf 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java @@ -37,7 +37,7 @@ import org.apache.ddlutils.platform.oracle.Oracle8Platform; import org.apache.ddlutils.platform.oracle.Oracle9Platform; import org.apache.ddlutils.platform.postgresql.PostgreSqlPlatform; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.h2.H2Platform; import org.springframework.beans.factory.BeanFactory; @@ -51,7 +51,7 @@ public class DbDialectFactory implements FactoryBean, BeanFactoryAware { - private static final Log logger = LogFactory.getLog(DbDialectFactory.class); + private static final ILog log = LogFactory.getLog(DbDialectFactory.class); private String db2zSeriesProductVersion; @@ -147,7 +147,7 @@ public Object doInConnection(Connection con) throws SQLException, DataAccessExce }); success = true; } catch (CannotGetJdbcConnectionException ex) { - logger.error("DatabaseConnectionException", ex.getMessage()); + log.error("DatabaseConnectionException", ex.getMessage()); try { Thread.sleep(10000); } catch (InterruptedException e) { diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java index b9bc0c512f..eb26f2fd12 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/SqlScript.java @@ -30,7 +30,7 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.ConnectionCallback; @@ -44,7 +44,7 @@ public class SqlScript { static final String COMMENT_CHARS_1 = "--"; static final String COMMENT_CHARS_2 = "#"; - static final Log logger = LogFactory.getLog(SqlScript.class); + static final ILog log = LogFactory.getLog(SqlScript.class); public final static char QUERY_ENDS = ';'; @@ -85,7 +85,7 @@ private void closeQuietly(Statement stmt) { try { stmt.close(); } catch (SQLException e) { - logger.error(e); + log.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("ScriptRunning", fileName); + log.info("ScriptRunning", fileName); int lineCount = 0; try { @@ -124,7 +124,7 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc if (checkStatementEnds(line)) { sql.append(" "); sql.append(line.substring(0, line.lastIndexOf(delimiter))); - logger.debug("Sql", sql); + log.debug("Sql", sql); try { st.execute(replaceTokens(sql.toString())); count++; @@ -133,11 +133,11 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc } } catch (SQLException e) { if (failOnError) { - logger.error("SqlError", sql.toString(), e); + log.error("SqlError", sql.toString(), e); throw e; } else { if (e.getErrorCode() != 942 && e.getErrorCode() != 2289) { - logger.warn("Sql", e.getMessage() + ": " + sql.toString()); + log.warn("Sql", e.getMessage() + ": " + sql.toString()); } else if (sql.toString().toLowerCase().startsWith("drop")) { notFoundCount++; } @@ -153,12 +153,12 @@ public Object doInConnection(Connection connection) throws SQLException, DataAcc connection.commit(); - logger.info("ScriptCompleted", count, fileName); + log.info("ScriptCompleted", count, fileName); if (notFoundCount > 0) { - logger.info("ScriptDropError", notFoundCount); + log.info("ScriptDropError", notFoundCount); } } catch (Exception e) { - logger.info("ScriptError", lineCount, fileName); + log.info("ScriptError", lineCount, fileName); throw new RuntimeException(e); } finally { closeQuietly(st); diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/db2/Db2DbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/db2/Db2DbDialect.java index 8e19113029..855ebe22f8 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/db2/Db2DbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/db2/Db2DbDialect.java @@ -24,7 +24,7 @@ import java.net.URL; import org.apache.commons.lang.StringUtils; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -38,7 +38,7 @@ public class Db2DbDialect extends AbstractDbDialect implements IDbDialect { static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled"; - static final Log logger = LogFactory.getLog(Db2DbDialect.class); + static final ILog log = LogFactory.getLog(Db2DbDialect.class); @Override protected void initForSpecificDialect() { @@ -46,11 +46,11 @@ protected void initForSpecificDialect() { enableSyncTriggers(); } catch (Exception e) { try { - logger.info("EnvironmentVariablesCreating", SYNC_TRIGGERS_DISABLED_USER_VARIABLE, + log.info("EnvironmentVariablesCreating", SYNC_TRIGGERS_DISABLED_USER_VARIABLE, SYNC_TRIGGERS_DISABLED_NODE_VARIABLE); new SqlScript(getSqlScriptUrl(), getPlatform().getDataSource(), ';').execute(); } catch (Exception ex) { - logger.error("DB2DialectInitializingError", ex); + log.error("DB2DialectInitializingError", ex); } } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdDbDialect.java index c1fa6f575f..8d5bb50e28 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdDbDialect.java @@ -20,7 +20,7 @@ package org.jumpmind.symmetric.db.firebird; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -30,7 +30,7 @@ public class FirebirdDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(FirebirdDbDialect.class); + static final ILog log = LogFactory.getLog(FirebirdDbDialect.class); static final String SYNC_TRIGGERS_DISABLED_USER_VARIABLE = "sync_triggers_disabled"; @@ -47,7 +47,7 @@ protected void createRequiredFunctions() { jdbcTemplate.queryForInt("select char_length(sym_escape('')) from rdb$database"); } catch (UncategorizedSQLException e) { if (e.getSQLException().getErrorCode() == -804) { - logger.error("FirebirdSymUdfMissing"); + log.error("FirebirdSymUdfMissing"); } throw new RuntimeException("FirebirdSymEscapeMissing", e); } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/h2/H2DbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/h2/H2DbDialect.java index ed0612a147..63cc56f184 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/h2/H2DbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/h2/H2DbDialect.java @@ -20,7 +20,7 @@ package org.jumpmind.symmetric.db.h2; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -31,7 +31,7 @@ public class H2DbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(H2DbDialect.class); + static final ILog log = LogFactory.getLog(H2DbDialect.class); private boolean storesUpperCaseNames = true; @Override @@ -91,14 +91,14 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc try { int count = jdbcTemplate.update(dropSql); if (count > 0) { - logger.info("TriggerDropped", triggerName); + log.info("TriggerDropped", triggerName); } count = jdbcTemplate.update(dropTable); if (count > 0) { - logger.info("TableDropped", triggerName); + log.info("TableDropped", triggerName); } } catch (Exception e) { - logger.warn("TriggerDropError", triggerName, e.getMessage()); + log.warn("TriggerDropError", triggerName, e.getMessage()); } } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/AbstractEmbeddedTrigger.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/AbstractEmbeddedTrigger.java index 976766414a..188c04a451 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/AbstractEmbeddedTrigger.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/AbstractEmbeddedTrigger.java @@ -38,7 +38,7 @@ import org.jumpmind.symmetric.SymmetricEngine; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.IDbDialect; import org.jumpmind.symmetric.model.DataEventType; @@ -56,7 +56,7 @@ */ public abstract class AbstractEmbeddedTrigger { - protected static final Log logger = LogFactory.getLog(AbstractEmbeddedTrigger.class); + protected static final ILog log = LogFactory.getLog(AbstractEmbeddedTrigger.class); protected static final FastDateFormat dateFormatter = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss.S"); protected IDataService dataService; protected ITriggerService triggerService; @@ -84,7 +84,7 @@ protected boolean initialize(DataEventType triggerType, String tableName) { this.trigger = triggerService.getActiveTriggersForSourceNodeGroup( parameterService.getString(ParameterConstants.NODE_GROUP_ID), true).get(triggerHistory.getTriggerId()); if (trigger == null) { - logger.warn("TriggerMissing", triggerType.name(), tableName, getTriggerHistId()); + log.warn("TriggerMissing", triggerType.name(), tableName, getTriggerHistId()); return false; } this.table = dbDialect.getMetaDataFor(null, trigger.getSourceSchemaName(), tableName, true); diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java index fc96e3659b..eeb31a9848 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java @@ -22,7 +22,7 @@ import org.apache.ddlutils.model.Table; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -32,7 +32,7 @@ public class HsqlDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(HsqlDbDialect.class); + static final ILog log = LogFactory.getLog(HsqlDbDialect.class); public static String DUAL_TABLE = "DUAL"; @@ -121,7 +121,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc try { jdbcTemplate.update(dropSql); } catch (Exception e) { - logger.warn("TriggerDropError", triggerName, e.getMessage()); + log.warn("TriggerDropError", triggerName, e.getMessage()); } } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbTrigger.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbTrigger.java index e9abdec118..ed5316ff0c 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbTrigger.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbTrigger.java @@ -27,14 +27,14 @@ import org.apache.commons.lang.StringUtils; import org.hsqldb.Token; import org.hsqldb.types.Binary; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.model.Data; import org.jumpmind.symmetric.model.DataEventType; public class HsqlDbTrigger extends AbstractEmbeddedTrigger implements org.hsqldb.Trigger { - static final Log logger = LogFactory.getLog(HsqlDbTrigger.class); + static final ILog log = LogFactory.getLog(HsqlDbTrigger.class); String triggerName; @@ -62,7 +62,7 @@ public void fire(int type, String triggerName, String tableName, Object[] oldRow } } } catch (RuntimeException ex) { - logger.error(ex); + log.error(ex); throw ex; } finally { lastTransactionIdUpdate = System.currentTimeMillis(); @@ -95,7 +95,7 @@ private void init(int type, String triggerName, String tableName) { if (initialize(getDataEventType(type), tableName)) { buildDataSelectSql(); buildTransactionIdSql(); - logger.debug("TriggerInitializing", triggerName, triggerType); + log.debug("TriggerInitializing", triggerName, triggerType); initialized = true; } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlDbDialect.java index 7040c3ed71..14df0c997e 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlDbDialect.java @@ -32,7 +32,7 @@ import org.apache.ddlutils.model.Column; import org.apache.ddlutils.model.Table; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -54,7 +54,7 @@ */ public class MsSqlDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(MsSqlDbDialect.class); + static final ILog log = LogFactory.getLog(MsSqlDbDialect.class); @Override protected void initForSpecificDialect() { @@ -135,7 +135,7 @@ public Object doInConnection(Connection con) throws SQLException, DataAccessExce stmt = con.createStatement(); stmt.execute(sql); } catch (Exception e) { - logger.warn("TriggerDropError", triggerName); + log.warn("TriggerDropError", triggerName); } finally { if (catalogName != null) { con.setCatalog(previousCatalog); diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java index 97ed44ee5f..8d6c3054f7 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java @@ -27,7 +27,7 @@ import org.apache.ddlutils.model.Table; import org.jumpmind.symmetric.Version; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -37,7 +37,7 @@ public class MySqlDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(MySqlDbDialect.class); + static final ILog log = LogFactory.getLog(MySqlDbDialect.class); static final String TRANSACTION_ID_FUNCTION_NAME = "fn_transaction_id"; @@ -51,7 +51,7 @@ public class MySqlDbDialect extends AbstractDbDialect implements IDbDialect { protected void initForSpecificDialect() { int[] versions = Version.parseVersion(getProductVersion()); if (getMajorVersion() == 5 && (getMinorVersion() == 0 || (getMinorVersion() == 1 && versions[2] < 23))) { - logger.info("TransactionIDSupportEnabling"); + log.info("TransactionIDSupportEnabling"); supportsTransactionId = true; } } @@ -71,7 +71,7 @@ protected void createRequiredFunctions() { if (!funcName.equals("fn_transaction_id") || supportsTransactionId) { if (jdbcTemplate.queryForInt(sqlTemplate.getFunctionInstalledSql(funcKey, defaultSchema)) == 0) { jdbcTemplate.update(sqlTemplate.getFunctionSql(funcKey, funcName, defaultSchema)); - logger.info("FunctionInstalled", funcName); + log.info("FunctionInstalled", funcName); } } } @@ -97,7 +97,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc try { jdbcTemplate.update(sql); } catch (Exception e) { - logger.warn("TriggerDoesNotExist"); + log.warn("TriggerDoesNotExist"); } } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/oracle/OracleDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/oracle/OracleDbDialect.java index 230b9da809..f532e1dbc3 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/oracle/OracleDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/oracle/OracleDbDialect.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.ddlutils.model.Table; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -39,7 +39,7 @@ public class OracleDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(OracleDbDialect.class); + static final ILog log = LogFactory.getLog(OracleDbDialect.class); static final String ORACLE_OBJECT_TYPE = "FUNCTION"; @@ -71,7 +71,7 @@ public void initTrigger(StringBuilder sqlBuffer, DataEventType dml, Trigger trig if (ex.getSQLException().getErrorCode() == 4095) { try { // a trigger of the same name must already exist on a table - logger.warn("TriggerAlreadyExists", jdbcTemplate.queryForMap( + log.warn("TriggerAlreadyExists", jdbcTemplate.queryForMap( "select * from user_triggers where trigger_name like upper(?)", new Object[] { hist .getTriggerNameForDmlType(dml) })); } catch (DataAccessException e) { diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlDbDialect.java index 2097a2ad14..836eacb583 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlDbDialect.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlDbDialect.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.symmetric.common.ParameterConstants; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.AbstractDbDialect; import org.jumpmind.symmetric.db.BinaryEncoding; @@ -37,7 +37,7 @@ public class PostgreSqlDbDialect extends AbstractDbDialect implements IDbDialect { - static final Log logger = LogFactory.getLog(PostgreSqlDbDialect.class); + static final ILog log = LogFactory.getLog(PostgreSqlDbDialect.class); static final String TRANSACTION_ID_EXPRESSION = "txid_current()"; @@ -52,15 +52,15 @@ public class PostgreSqlDbDialect extends AbstractDbDialect implements IDbDialect @Override protected void initForSpecificDialect() { if (getMajorVersion() >= 8 && getMinorVersion() >= 3) { - logger.info("TransactionIDSupportEnabling"); + log.info("TransactionIDSupportEnabling"); supportsTransactionId = true; transactionIdExpression = TRANSACTION_ID_EXPRESSION; } try { enableSyncTriggers(); } catch (Exception e) { - logger.error("PostgreSqlCustomVariableMissing"); - throw new RuntimeException(logger.getMessage("PostgreSqlCustomVariableMissing"), e); + log.error("PostgreSqlCustomVariableMissing"); + throw new RuntimeException(log.getMessage("PostgreSqlCustomVariableMissing"), e); } } @@ -96,7 +96,7 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc jdbcTemplate.update(dropSql); jdbcTemplate.update(dropFunction); } catch (Exception e) { - logger.warn("TriggerDoesNotExist"); + log.warn("TriggerDoesNotExist"); } } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/ext/ExtensionProcessor.java b/symmetric/src/main/java/org/jumpmind/symmetric/ext/ExtensionProcessor.java index 02050e7dce..440931a36d 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/ext/ExtensionProcessor.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/ext/ExtensionProcessor.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.jumpmind.symmetric.common.logging.ILog; +import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.config.INodeIdGenerator; import org.jumpmind.symmetric.config.IParameterFilter; import org.jumpmind.symmetric.config.ITriggerCreationListener; @@ -67,7 +67,7 @@ */ public class ExtensionProcessor implements BeanFactoryPostProcessor { - final Log logger = LogFactory.getLog(getClass()); + final ILog log = LogFactory.getLog(getClass()); private IDataLoaderService dataLoaderService; @@ -82,7 +82,7 @@ public class ExtensionProcessor implements BeanFactoryPostProcessor { private IAcknowledgeService acknowledgeService; private IRegistrationService registrationService; - + private ITriggerService triggerService; private ITransportManager transportManager; @@ -127,8 +127,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) private void registerExtension(String beanName, IExtensionPoint ext) { - logger.info(String.format("Registering an extension point named '%s' of type '%s' with SymmetricDS", beanName, - ext.getClass().getSimpleName())); + log.info("ExtensionRegistering", beanName, ext.getClass().getSimpleName()); if (ext instanceof ISyncUrlExtension) { transportManager.addExtensionSyncUrlHandler(beanName, (ISyncUrlExtension) ext); @@ -231,7 +230,7 @@ public void setTransportManager(ITransportManager transportManager) { public void setRoutingService(IRouterService routingService) { this.routingService = routingService; } - + public void setTriggerService(ITriggerService triggerService) { this.triggerService = triggerService; } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/AbstractStreamDataCommand.java b/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/AbstractStreamDataCommand.java index 482a139fcf..8b16fff8c5 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/AbstractStreamDataCommand.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/AbstractStreamDataCommand.java @@ -21,11 +21,11 @@ package org.jumpmind.symmetric.extract.csv; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.jumpmind.symmetric.common.logging.ILog; +import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.util.CsvUtils; abstract class AbstractStreamDataCommand implements IStreamDataCommand { protected static final String DELIMITER = CsvUtils.DELIMITER; - protected Log logger = LogFactory.getLog(getClass()); + protected ILog log = LogFactory.getLog(getClass()); } \ No newline at end of file diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/StreamReloadDataCommand.java b/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/StreamReloadDataCommand.java index 3793f22cbd..0e1a225877 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/StreamReloadDataCommand.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/extract/csv/StreamReloadDataCommand.java @@ -52,7 +52,7 @@ public void execute(BufferedWriter out, Data data, DataExtractorContext context) dataExtractorService.extractInitialLoadWithinBatchFor(node, trigger, out, context); out.flush(); } else { - logger.error(String.format("The trigger %s is not longer available for an initial load.", id)); + log.error("TriggerUnavailable", id); } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java b/symmetric/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java index ae8fbfb327..bff71c883d 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java @@ -21,8 +21,8 @@ import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.jumpmind.symmetric.common.logging.ILog; +import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.ext.INodeGroupExtensionPoint; import org.jumpmind.symmetric.load.IDataLoader; import org.jumpmind.symmetric.load.IDataLoaderContext; @@ -33,9 +33,10 @@ * An abstract convenience class meant to be implemented by classes that need to * publish text messages */ -abstract public class AbstractTextPublisherDataLoaderFilter implements IPublisherFilter, INodeGroupExtensionPoint, BeanNameAware { +abstract public class AbstractTextPublisherDataLoaderFilter implements IPublisherFilter, INodeGroupExtensionPoint, + BeanNameAware { - private static final Log logger = LogFactory.getLog(AbstractTextPublisherDataLoaderFilter.class); + private static final ILog log = LogFactory.getLog(AbstractTextPublisherDataLoaderFilter.class); private final String MSG_CACHE = "msg_CACHE" + hashCode(); @@ -121,9 +122,7 @@ private void finalizeAndPublish(IDataLoaderContext ctx) { StringBuilder msg = getFromCache(ctx); if (msg.length() > 0) { msg.append(addTextFooter(ctx)); - if (logger.isDebugEnabled()) { - logger.debug("publishing text message -> " + msg); - } + log.debug("TextMessagePublishing", msg); ctx.getContextCache().remove(MSG_CACHE); publisher.publish(ctx, msg.toString()); } @@ -141,10 +140,7 @@ protected void logCount() { messagesSinceLastLogOutput++; long timeInMsSinceLastLogOutput = System.currentTimeMillis() - lastTimeInMsOutputLogged; if (timeInMsSinceLastLogOutput > minTimeInMsBetweenLogOutput) { - if (logger.isInfoEnabled()) { - logger.info(beanName + " published " + messagesSinceLastLogOutput + " messages in the last " - + timeInMsSinceLastLogOutput + "ms"); - } + log.info("TextMessagePubished", beanName, messagesSinceLastLogOutput, timeInMsSinceLastLogOutput); lastTimeInMsOutputLogged = System.currentTimeMillis(); messagesSinceLastLogOutput = 0; } @@ -185,13 +181,13 @@ public void setMinTimeInMsBetweenLogOutput(long timeInMsBetweenLogOutput) { public void setTableName(String tableName) { this.tableName = tableName; } - + public void batchCommitted(IDataLoader loader, IncomingBatch batch) { } public void batchRolledback(IDataLoader loader, IncomingBatch batch) { } - + public void earlyCommit(IDataLoader loader, IncomingBatch batch) { } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java index c8053708a1..bc74cdd8de 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import org.jumpmind.symmetric.common.logging.Log; +import org.jumpmind.symmetric.common.logging.ILog; import org.jumpmind.symmetric.common.logging.LogFactory; import org.jumpmind.symmetric.db.IDbDialect; import org.jumpmind.symmetric.model.DataEventType; @@ -37,7 +37,7 @@ public abstract class AbstractDataRouter implements IDataRouter { private static final String OLD_ = "OLD_"; - protected final Log logger = LogFactory.getLog(getClass()); + protected final ILog log = LogFactory.getLog(getClass()); private boolean autoRegister = true; @@ -130,6 +130,6 @@ protected Set toNodeIds(Set nodes) { * Override if needed. */ public void completeBatch(IRouterContext context, OutgoingBatch batch) { - logger.debug("BatchCompleting", batch.getBatchId()); + log.debug("BatchCompleting", batch.getBatchId()); } } diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java index ee1f976961..eea94cb32b 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java @@ -35,7 +35,7 @@ public Collection routeToNodes(IRouterContext context, DataMetaData data context.incrementStat(System.currentTimeMillis() - ts, "bsh.eval"); return eval(returnValue, nodes, targetNodes); } catch (EvalError e) { - logger.error("Error in data router. Routing to nobody.", e); + log.error("Error in data router. Routing to nobody.", e); return Collections.emptySet(); } } diff --git a/symmetric/src/main/resources/logMessages_en_US.properties b/symmetric/src/main/resources/logMessages_en_US.properties index ecaa0bf645..581cf48ccb 100644 --- a/symmetric/src/main/resources/logMessages_en_US.properties +++ b/symmetric/src/main/resources/logMessages_en_US.properties @@ -5,6 +5,7 @@ BatchCompleting=Completing batch %d DB2DialectInitializingError=Error while initializing DB2 dialect DatabaseConnectionException=Could not get a connection to the database: %s. Waiting for 10 seconds before trying to connect to the database again. EnvironmentVariablesCreating=Creating environment variables %s and %s +ExtensionRegistering=Registering an extension point named %s of type '%s' with SymmetricDS FirebirdSymUdfMissing=Please install the sym_udf.so/dll to your {firebird_home}/UDF folder FirebirdSymEscapeMissing=Function SYM_ESCAPE is not installed FunctionInstalled=Just installed %s @@ -19,6 +20,8 @@ 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. +TextMessagePublishing=Publishing text message %s +TextMessagePublished=%s published %d messages in the last %d ms. TransactionIDSupportEnabling=Enabling transaction ID support TriggerCreateFailed=Failed to create trigger: %s TriggerCreating=Creating %s trigger for %s %s @@ -30,4 +33,5 @@ TriggerAlreadyExists=A trigger already exists for that name. Details are as fol TriggerMayExist=Could not figure out if the trigger exists. Assuming that is does not. TriggerNameTruncated=We just truncated the trigger name for the %s trigger id=%d. You might want to consider manually providing a name for the trigger that is less than %d characters long. TriggerInitializing=Initializing %s for %s +TriggerUnavailable=The trigger %s is no longer available for an initial load. diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/common/logging/LogTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/common/logging/LogTest.java index 23968ea996..df54b28d49 100644 --- a/symmetric/src/test/java/org/jumpmind/symmetric/common/logging/LogTest.java +++ b/symmetric/src/test/java/org/jumpmind/symmetric/common/logging/LogTest.java @@ -7,37 +7,37 @@ public class LogTest { - private Log logger = LogFactory.getLog(this.getClass()); + private ILog log = LogFactory.getLog(this.getClass()); @Test public void getBasicMessages() { - logger.setLocale(new Locale("en_US")); + log.setLocale(new Locale("en_US")); long l = 4l; - String s = logger.getMessage("BatchCompleting"); + String s = log.getMessage("BatchCompleting"); Assert.assertEquals("Completing batch null", s); - s = logger.getMessage("BatchCompleting", l); + s = log.getMessage("BatchCompleting", l); Assert.assertEquals("Completing batch 4", s); } @Test public void getSpanishMessages() { - logger.setLocale(new Locale("es")); + log.setLocale(new Locale("es")); long l = 4l; - String s = logger.getMessage("BatchCompleting"); + String s = log.getMessage("BatchCompleting"); Assert.assertEquals("Realizaci—n de la hornada null", s); - s = logger.getMessage("BatchCompleting", l); + s = log.getMessage("BatchCompleting", l); Assert.assertEquals("Realizaci—n de la hornada 4", s); } @Test public void getBadLanguageMessages() { Locale.setDefault(new Locale("en_US")); - logger.setLocale(new Locale("zz")); + log.setLocale(new Locale("zz")); long l = 4l; - String s = logger.getMessage("BatchCompleting"); + String s = log.getMessage("BatchCompleting"); Assert.assertEquals("Completing batch null", s); - s = logger.getMessage("BatchCompleting", l); + s = log.getMessage("BatchCompleting", l); Assert.assertEquals("Completing batch 4", s); }