Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
382a8a01
Commit
382a8a01
authored
8 years ago
by
gakin
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java
+3
-3
3 additions, 3 deletions
...s/generic/server/dss/plugins/DataSetRegistrationTask.java
with
3 additions
and
3 deletions
datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java
+
3
−
3
View file @
382a8a01
...
@@ -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
,
AbstractDataSetDeletionPostProcessingMaintenance
Task
.
class
);
LogFactory
.
getLogger
(
LogCategory
.
OPERATION
,
DataSetRegistration
Task
.
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
Runtime
Exception
(
"Status Code was "
+
statusCode
+
" instead of "
+
HttpStatus
.
Code
.
OK
.
getCode
());
throw
new
IO
Exception
(
"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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment