From 7fe254146e55f30d898b4224843317e8760c0a24 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 5 Aug 2009 11:40:14 +0000
Subject: [PATCH] fix: switch on DSS logging
SVN: 11996
---
.../source/java/dssApplicationContext.xml | 13 ++++++
.../openbis/generic/server/ETLService.java | 43 +++++++++++--------
2 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/datastore_server/source/java/dssApplicationContext.xml b/datastore_server/source/java/dssApplicationContext.xml
index 8098c97d241..c269a1a67a5 100644
--- a/datastore_server/source/java/dssApplicationContext.xml
+++ b/datastore_server/source/java/dssApplicationContext.xml
@@ -53,4 +53,17 @@
<bean id="session-token-manager" class="ch.systemsx.cisd.openbis.dss.generic.server.SessionTokenManager"/>
+
+ <!--
+ // This discovers on-the-fly all <code>org.springframework.aop.Advisor</code> implementations.
+ -->
+ <bean id="bean-post-processor"
+ class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator" />
+
+ <!--
+ // Logging
+ -->
+
+ <bean class="ch.systemsx.cisd.common.spring.LogAdvisor" />
+
</beans>
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 2521c468b54..8bffa2807d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -125,29 +125,11 @@ public class ETLService extends AbstractServer<IETLService> implements IETLServi
String remoteHost = session.getRemoteHost();
int port = info.getPort();
final String dssURL = "https://" + remoteHost + ":" + port;
+ checkVersion(dssSessionToken, dssURL);
IDataStoreDAO dataStoreDAO = daoFactory.getDataStoreDAO();
DataStorePE dataStore = dataStoreDAO.tryToFindDataStoreByCode(info.getDataStoreCode());
if (dataStore == null)
{
- final IDataStoreService service = dssFactory.create(dssURL);
- if (operationLog.isInfoEnabled())
- {
- operationLog.info("Obtain version of Data Store Server at " + dssURL);
- }
- int dssVersion = service.getVersion(dssSessionToken);
- if (IDataStoreService.VERSION != dssVersion)
- {
- String msg =
- "Data Store Server version is " + dssVersion + " instead of "
- + IDataStoreService.VERSION;
- notificationLog.error(msg);
- throw new ConfigurationFailureException(msg);
- }
- if (operationLog.isInfoEnabled())
- {
- operationLog.info("Data Store Server (version " + dssVersion + ") registered for "
- + dssURL);
- }
dataStore = new DataStorePE();
dataStore.setDatabaseInstance(getHomeDatabaseInstance(sessionToken));
}
@@ -159,6 +141,29 @@ public class ETLService extends AbstractServer<IETLService> implements IETLServi
dataStoreDAO.createOrUpdateDataStore(dataStore);
}
+ private void checkVersion(String dssSessionToken, final String dssURL)
+ {
+ final IDataStoreService service = dssFactory.create(dssURL);
+ if (operationLog.isInfoEnabled())
+ {
+ operationLog.info("Obtain version of Data Store Server at " + dssURL);
+ }
+ int dssVersion = service.getVersion(dssSessionToken);
+ if (IDataStoreService.VERSION != dssVersion)
+ {
+ String msg =
+ "Data Store Server version is " + dssVersion + " instead of "
+ + IDataStoreService.VERSION;
+ notificationLog.error(msg);
+ throw new ConfigurationFailureException(msg);
+ }
+ if (operationLog.isInfoEnabled())
+ {
+ operationLog.info("Data Store Server (version " + dssVersion + ") registered for "
+ + dssURL);
+ }
+ }
+
private void setServices(DataStorePE dataStore, DatastoreServiceDescriptions serviceDescs,
IDataStoreDAO dataStoreDAO)
{
--
GitLab