Displaying differences for changeset
 
display as  

src/csip/Config.java

@@ -105,7 +105,7 @@
         /* 
          The CSIP version
          */
-        put("csip.version", "$version: 2.1.11 0904889a1467 2016-04-01 od, built at 2016-04-01 21:23 by od$");
+        put("csip.version", "$version: 2.1.13 4fc5a24a0aff 2016-04-01 od, built at 2016-04-04 10:44 by od$");
 
         /*
          * The runtime architecture. 
@@ -1108,7 +1108,7 @@
 
 
         PostgresAccessLogStore(String url) {
-            Binaries.addToJDBCPool(jdbc_session_id, url, "org.postgresql.Driver");
+            Binaries.addToJDBCPool(jdbc_session_id, url);
         }
 
 
@@ -1143,9 +1143,11 @@
                             + node_ip + "');");
                 }
             } catch (SQLTimeoutException to) {
+                retry--;
                 LOG.info("accesslog timeout " + to.getMessage());
+                l.info("accesslog timeout " + to.getMessage());
+            } catch (SQLException | ServiceException ex) {
                 retry--;
-            } catch (SQLException | ServiceException ex) {
                 l.log(Level.SEVERE, null, ex);
                 LOG.log(Level.SEVERE, null, ex);
             }

src/csip/utils/Binaries.java

@@ -109,6 +109,7 @@
 
                     logger.info("JDBC Pool properties:" + p.toString());
                     datasource = new org.apache.tomcat.jdbc.pool.DataSource(p);
+//                    datasource.setLoginTimeout();
                     logger.info("Created JDBC datasource: " + datasource.toString());
                 }
                 return datasource.getConnection();
@@ -422,9 +423,8 @@
     }
 
 
-    public static void addToJDBCPool(String id, String url, String driverclass) {
+    public static void addToJDBCPool(String id, String url) {
         Map<String, String> env = new HashMap<>();
-        env.put("driverClassName", driverclass);
         jdbcPools.put(id, new JDBCPool(url, env));
     }