Skip to content
Snippets Groups Projects
Commit 382a8a01 authored by gakin's avatar gakin
Browse files

SSDM-4141: Fix logger name so that we can divert the output of this class to a separate file.

SVN: 37092
parent 9ca7b813
No related branches found
No related tags found
No related merge requests found
...@@ -109,7 +109,6 @@ import ch.systemsx.cisd.common.maintenance.IMaintenanceTask; ...@@ -109,7 +109,6 @@ import ch.systemsx.cisd.common.maintenance.IMaintenanceTask;
import ch.systemsx.cisd.common.parser.MemorySizeFormatter; import ch.systemsx.cisd.common.parser.MemorySizeFormatter;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils; import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
import ch.systemsx.cisd.common.ssl.SslCertificateHelper; import ch.systemsx.cisd.common.ssl.SslCertificateHelper;
import ch.systemsx.cisd.etlserver.plugins.AbstractDataSetDeletionPostProcessingMaintenanceTask;
import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.ConversionUtils; import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.ConversionUtils;
import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSet; import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSet;
import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2; import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
...@@ -167,7 +166,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier; ...@@ -167,7 +166,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
public class DataSetRegistrationTask<T extends DataSetInformation> implements IMaintenanceTask public class DataSetRegistrationTask<T extends DataSetInformation> implements IMaintenanceTask
{ {
protected static final Logger operationLog = protected static final Logger operationLog =
LogFactory.getLogger(LogCategory.OPERATION, AbstractDataSetDeletionPostProcessingMaintenanceTask.class); LogFactory.getLogger(LogCategory.OPERATION, DataSetRegistrationTask.class);
// private static final String DATA_SOURCE_URI = "https://bs-mbpr121.d.ethz.ch:8444/datastore_server/re-sync"; // // private static final String DATA_SOURCE_URI = "https://bs-mbpr121.d.ethz.ch:8444/datastore_server/re-sync"; //
// "http://localhost:8889/datastore_server/re-sync"; // "http://localhost:8889/datastore_server/re-sync";
...@@ -331,7 +330,7 @@ public class DataSetRegistrationTask<T extends DataSetInformation> implements IM ...@@ -331,7 +330,7 @@ public class DataSetRegistrationTask<T extends DataSetInformation> implements IM
if (statusCode != HttpStatus.Code.OK.getCode()) if (statusCode != HttpStatus.Code.OK.getCode())
{ {
throw new RuntimeException("Status Code was " + statusCode + " instead of " + HttpStatus.Code.OK.getCode()); throw new IOException ("Status Code was " + statusCode + " instead of " + HttpStatus.Code.OK.getCode());
} }
byte[] content = contentResponse.getContent(); byte[] content = contentResponse.getContent();
...@@ -746,6 +745,7 @@ public class DataSetRegistrationTask<T extends DataSetInformation> implements IM ...@@ -746,6 +745,7 @@ public class DataSetRegistrationTask<T extends DataSetInformation> implements IM
} }
operationResult = service.performEntityOperations(builder.getDetails()); operationResult = service.performEntityOperations(builder.getDetails());
System.err.println("entity operation result: " + operationResult); System.err.println("entity operation result: " + operationResult);
operationLog.info("entity operation result: " + operationResult);
operationLog.info("Processing deletions"); operationLog.info("Processing deletions");
processDeletions(data); processDeletions(data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment