Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java @ 8485:026f4c684ee5
Make maxWait configurable and wait for 30 seconds
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 28 Nov 2014 16:34:40 +0100 |
| parents | c5a7aae52396 |
| children | 6a4bdcccfa4d |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java Fri Nov 28 10:21:40 2014 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java Fri Nov 28 16:34:40 2014 +0100 @@ -87,6 +87,9 @@ public static final String XPATH_VALIDATION_QUERY = "/artifact-database/seddb-database/validation-query/text()"; + public static final String XPATH_MAX_WAIT = + "/artifact-database/seddb-database/max-wait/text()"; + public static final String DEFAULT_USER = System.getProperty("flys.seddb.user", "seddb"); @@ -116,6 +119,9 @@ System.getProperty( "flys.seddb.connection.validation.query"); + public static final String DEFAULT_MAX_WAIT = + System.getProperty("flys.seddb.connection.max.wait"); + public static final Class [] CLASSES = { BezugspegelgewId.class, Bezugspegelgew.class, @@ -183,11 +189,12 @@ String driver, String url, String connectionInitSqls, - String validationQuery + String validationQuery, + String maxWait ) { super( user, password, dialect, driver, url, - connectionInitSqls, validationQuery, CLASSES); + connectionInitSqls, validationQuery, maxWait, CLASSES); } public static synchronized Credentials getInstance() { @@ -210,10 +217,12 @@ Config.getStringXPath( XPATH_VALIDATION_QUERY, DEFAULT_VALIDATION_QUERY); + String maxWait = + Config.getStringXPath(XPATH_MAX_WAIT, DEFAULT_MAX_WAIT); instance = new SedDBCredentials( user, password, dialect, driver, url, - connectionInitSqls, validationQuery); + connectionInitSqls, validationQuery, maxWait); } return instance; } @@ -226,7 +235,9 @@ DEFAULT_DRIVER, DEFAULT_URL, DEFAULT_CONNECTION_INIT_SQLS, - DEFAULT_VALIDATION_QUERY); + DEFAULT_VALIDATION_QUERY, + DEFAULT_MAX_WAIT + ); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :