diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java index 41df6f18f3afadd46abbaa56392ccd01dd4156df..f4b23421022f646ca167f733978ffc83039c7fcd 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java @@ -41,6 +41,9 @@ public class DssRegistrationLogger implements IDSSRegistrationLogger private static final Logger notificationLog = LogFactory.getLogger(LogCategory.NOTIFY, DssRegistrationLogger.class); + private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION, + DssRegistrationLogger.class); + private File file; private final DssRegistrationLogDirectoryHelper helper; @@ -102,7 +105,7 @@ public class DssRegistrationLogger implements IDSSRegistrationLogger } private static FastDateFormat simpleNoISODateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss"); - + /** * Logs a message. */ @@ -116,48 +119,78 @@ public class DssRegistrationLogger implements IDSSRegistrationLogger FileUtilities.appendToFile(file, logMessage.toString(), false); } - @Override public void info(Logger logger, String message) { logger.info(message); log(message); } - @Override public void warn(Logger logger, String message) { logger.warn(message); log(message); } - @Override public void error(Logger logger, String message) { logger.error(message); log(message); } - @Override public void info(Logger logger, String message, Throwable ex) { logger.info(message, ex); log(ex, message); } - @Override public void warn(Logger logger, String message, Throwable ex) { logger.warn(message, ex); log(ex, message); } - @Override public void error(Logger logger, String message, Throwable ex) { logger.error(message, ex); log(ex, message); } + @Override + public void info(String message) + { + info(operationLog, message); + } + + @Override + public void warn(String message) + { + warn(operationLog, message); + } + + @Override + public void error(String message) + { + error(operationLog, message); + } + + @Override + public void info(String message, Throwable ex) + { + info(operationLog, message, ex); + } + + @Override + public void warn(String message, Throwable ex) + { + warn(operationLog, message, ex); + } + + @Override + public void error(String message, Throwable ex) + { + error(operationLog, message, ex); + } + /** * Logs class and message of exception. */ diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java index 40788ab285d218ef85f5825135cfa2715419c1bc..18f316e075941a289650c4d8cff181410dec1ae0 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java @@ -16,7 +16,6 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2; -import org.apache.log4j.Logger; /** * Logging interface exposed through a dropbox api. @@ -25,15 +24,15 @@ import org.apache.log4j.Logger; */ public interface IDSSRegistrationLogger { - public void info(Logger logger, String message); + public void info(String message); - public void warn(Logger logger, String message); + public void warn(String message); - public void error(Logger logger, String message); + public void error(String message); - public void info(Logger logger, String message, Throwable ex); + public void info(String message, Throwable ex); - public void warn(Logger logger, String message, Throwable ex); + public void warn(String message, Throwable ex); - public void error(Logger logger, String message, Throwable ex); + public void error(String message, Throwable ex); }