Skip to content
Snippets Groups Projects
Commit 4b7eb5ea authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

added missing properties and environment variables management

parent fa33712b
No related branches found
No related tags found
No related merge requests found
......@@ -222,11 +222,11 @@ public class ApiUtils implements ApiConstants {
try {
if (historic == null) {
params.setParametersFromTango(TTS_DEVICE_CLASS);
String host = System.getProperty(TTS_HOST_PROPERTY);
params.setHost(host);
params.setName(System.getProperty(TTS_NAME_PROPERTY, params.getName()));
params.setHost(ApiUtils.getProperty(TTS_HOST_PROPERTY, TTS_HOST_ENV, params.getHost()));
params.setName(ApiUtils.getProperty(TTS_NAME_PROPERTY, TTS_NAME_ENV, params.getName()));
params.setDbType(DataBaseType.parseDataBaseType(
ApiUtils.getProperty(TTS_DB_TYPE_PROPERTY, TTS_DB_TYPE_ENV, params.getDbType().toString())));
params.setSchema(ApiUtils.getProperty(TTS_SCHEMA_PROPERTY, TTS_SCHEMA_ENV, params.getSchema()));
params.setMinPoolSize((short) ApiUtils.getIntProperty(TTS_MIN_POOL_SIZE_PROPERTY, TTS_MIN_POOL_SIZE_ENV,
params.getMinPoolSize()));
params.setMaxPoolSize((short) ApiUtils.getIntProperty(TTS_MAX_POOL_SIZE_PROPERTY, TTS_MAX_POOL_SIZE_ENV,
......
......@@ -6,12 +6,13 @@ import fr.soleil.archiving.hdbtdb.api.HdbTdbConnectionParameters;
import fr.soleil.comete.swing.util.CometeConstants;
import fr.soleil.lib.project.ObjectUtils;
import fr.soleil.mambo.api.ApiConstants;
import fr.soleil.mambo.api.ApiUtils;
// alternative for fr.soleil.archiving.hdbtdb.api.HdbTdbConnectionParameters, compatible with TTS too
public class DbConnectionParameters implements ApiConstants {
private static boolean ttsAvailable = CometeConstants.TRUE
.equalsIgnoreCase(System.getProperty(TTS_AVAILABLE_PROPERTY, CometeConstants.FALSE));
private static boolean ttsAvailable = CometeConstants.TRUE.equalsIgnoreCase(
ApiUtils.getProperty(TTS_AVAILABLE_PROPERTY, TTS_AVAILABLE_ENV, Boolean.FALSE.toString()));
private static String user, password;
private DbConnectionParameters() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment