Merge branch 'master' of...

Merge branch 'master' of gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/mamboarchivinggui

src/main/java/fr/soleil/mambo/api/archiving/TTSArchivingManagerApi.java

@@ -88,6 +88,8 @@ public class TTSArchivingManagerApi implements IArchivingManagerApi {
         config.setHost(params.getHost());
         config.setUser(params.getUser());
         config.setPassword(params.getPassword());
+        // TANGOARCH-833: possibility to connect to another port
+        config.setPort(ApiUtils.getProperty(ApiConstants.TTS_PORT_PROPERTY, ApiConstants.TTS_PORT_ENV, config.getPort()));
         config.setIdleTimeout(params.getInactivityTimeout());
         config.setMaxPoolSize(params.getMaxPoolSize());
         if (params.getHealthRegistry() != null) {
@@ -99,6 +101,7 @@ public class TTSArchivingManagerApi implements IArchivingManagerApi {
         TangoArchiverProperties properties = new TangoArchiverProperties();
         properties.setArchiverClassName(archiverClassName);
         TangoArchivingSystemConfigurationService service;
+        LOGGER.info("connecting to TTS {}", config);
         try {
             service = new TangoArchivingSystemConfigurationBuilder().build(config, properties);
         } catch (Exception e) {

src/main/java/fr/soleil/mambo/api/db/TTSDataBaseAccess.java

@@ -51,6 +51,7 @@ public class TTSDataBaseAccess implements IDataBaseAcess, ApiConstants {
         if (params.getMetricRegistry() != null) {
             config.setMetricRegistry(params.getMetricRegistry());
         }
+        LOGGER.info("connecting to TTS {}", config);
         attributeExtractor = new TTSAttributeExtractor(config);
     }