Merge pull request #33 from HSLdevcom/develop

1.0.5

Author: mjaakko

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl.transitdata</groupId>
     <artifactId>transitdata-pubtrans-source</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
 
     <repositories>

src/main/java/fi/hsl/transitdata/pulsarpubtransconnect/PubtransConnector.java

@@ -14,6 +14,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Queue;
+import java.util.concurrent.TimeUnit;
 
 public class PubtransConnector {
 
@@ -25,6 +26,7 @@ public class PubtransConnector {
     private String queryString;
     private boolean enableCacheCheck;
     private int cacheMaxAgeInMins;
+    private int queryTimeoutSecs;
 
     private PubtransTableHandler handler;
     private Jedis jedis;
@@ -45,6 +47,7 @@ public static PubtransConnector newInstance(Connection connection,
         connector.queryString = queryString(config);
         connector.enableCacheCheck = config.getBoolean("application.enableCacheTimestampCheck");
         connector.cacheMaxAgeInMins = config.getInt("application.cacheMaxAgeInMinutes");
+        connector.queryTimeoutSecs = (int)config.getDuration("pubtrans.queryTimeout", TimeUnit.SECONDS);
 
         log.info("Cache pre-condition enabled: " + connector.enableCacheCheck + " with max age "+ connector.cacheMaxAgeInMins);
 
@@ -117,6 +120,7 @@ public void queryAndProcessResults() throws SQLException, PulsarClientException
         try {
             statement = connection.prepareStatement(queryString);
             statement.setTimestamp(1, new java.sql.Timestamp(handler.getLastModifiedTimeStamp()));
+            statement.setQueryTimeout(queryTimeoutSecs);
             resultSet = statement.executeQuery();
             produceMessages(handler.handleResultSet(resultSet));
         }

src/main/resources/arrival.conf

@@ -25,6 +25,8 @@ pubtrans {
   # Pubtrans timestamps are not stored with the zone offset so we need to define how we should interpret the timestamps.
   timezone="Europe/Helsinki"
   timezone=${?PUBTRANS_DATA_TIMEZONE}
+  queryTimeout = 1 minute
+  queryTimeout = ${?PUBTRANS_QUERY_TIMEOUT}
 }
 
 application {

src/main/resources/departure.conf

@@ -25,6 +25,8 @@ pubtrans {
   # Pubtrans timestamps are not stored with the zone offset so we need to define how we should interpret the timestamps.
   timezone="Europe/Helsinki"
   timezone=${?PUBTRANS_DATA_TIMEZONE}
+  queryTimeout = 1 minute
+  queryTimeout = ${?PUBTRANS_QUERY_TIMEOUT}
 }
 
 application {