0.4.5 Update

fixed termination bug where trailing messages were not logged
added field_access column to trend_mappings table

Author: cvogt729

root/info.xml

@@ -1,7 +1,7 @@
 <extension version="1">
   <name>PostgreSQL_Connect</name>
   <description>Periodically synchronizes data to an external PostgreSQL database.</description>
-  <version>0.4.4</version>
+  <version>0.4.5</version>
   <vendor>Automatic Controls Equipment Systems, Inc.</vendor>
   <system-menu-provider>aces.webctrl.postgresql.web.SystemMenuEditor</system-menu-provider>
 </extension>

src/aces/webctrl/postgresql/core/Initializer.java

@@ -124,13 +124,13 @@ public void run(){
   @Override public void contextDestroyed(ServletContextEvent sce){
     stop = true;
     if (mainThread==null){
-      handleDestruction();
+      Config.save();
     }else{
       mainThread.interrupt();
       synchronized (syncNotifier){
         syncNotifier.notifyAll();
       }
-      handleDestruction();
+      Config.save();
       //Wait for the primary processing thread to terminate.
       while (true){
         try{
@@ -141,9 +141,6 @@ public void run(){
     }
     log("Execution terminated.");
     new Sync(Event.SHUTDOWN);
-  }
-  private static void handleDestruction(){
-    Config.save();
     // We deregister the PostgreSQL driver so that Tomcat does not complain
     final ClassLoader cl = Thread.currentThread().getContextClassLoader();
     final Enumeration<Driver> drivers = DriverManager.getDrivers();

src/aces/webctrl/postgresql/core/Sync.java

@@ -514,36 +514,31 @@ public void execute(SystemAccess sys){
                       "SELECT\n"+
                       "  \"x\".\"id\",\n"+
                       "  \"x\".\"persistent_identifier\",\n"+
+                      "  \"x\".\"field_access\",\n"+
                       "  GREATEST(\"y\".\"time\", CURRENT_TIMESTAMP-make_interval(days=>\"retain_data\")) AS \"start\"\n"+
                       "FROM (\n"+
                       "  SELECT * FROM webctrl.trend_mappings WHERE \"server_id\" = "+ID+"\n"+
                       ") \"x\" LEFT JOIN (\n"+
-                      "  SELECT\n"+
-                      "    \"x\".*\n"+
-                      "  FROM (\n"+
-                      "    SELECT DISTINCT ON (\"id\")\n"+
-                      "      \"id\",\n"+
-                      "      \"time\"\n"+
-                      "    FROM webctrl.trend_data\n"+
-                      "    ORDER BY \"id\" ASC, \"time\" DESC\n"+
-                      "  ) \"x\" INNER JOIN (\n"+
-                      "    SELECT \"id\" FROM webctrl.trend_mappings WHERE \"server_id\" = "+ID+"\n"+
-                      "  ) \"y\"\n"+
-                      "  ON \"x\".\"id\" = \"y\".\"id\"\n"+
+                      "  SELECT DISTINCT ON (\"id\")\n"+
+                      "    \"id\",\n"+
+                      "    \"time\"\n"+
+                      "  FROM webctrl.trend_data\n"+
+                      "  ORDER BY \"id\" ASC, \"time\" DESC\n"+
                       ") \"y\"\n"+
                       "ON \"x\".\"id\" = \"y\".\"id\";"
                     );
                   ){
                     TrendMapping tm;
                     OffsetDateTime t;
                     while (r.next()){
-                      t = r.getObject(3, OffsetDateTime.class);
+                      t = r.getObject(4, OffsetDateTime.class);
                       if (t==null){
                         continue;
                       }
                       tm = new TrendMapping();
                       tm.ID = r.getInt(1);
                       tm.persistentIdentifier = r.getString(2);
+                      tm.fieldAccess = r.getBoolean(3);
                       tm.start = java.util.Date.from(t.toInstant());
                       trends.add(tm);
                     }
@@ -570,7 +565,7 @@ public void execute(SystemAccess sys){
                       boolValues.x = null;
                       boolNulls.x = null;
                       try{
-                        sysCon.runReadAction(FieldAccessFactory.newFieldAccess(), new ReadAction(){
+                        sysCon.runReadAction(tm.fieldAccess?FieldAccessFactory.newFieldAccess():FieldAccessFactory.newDisabledFieldAccess(), new ReadAction(){
                           @Override public void execute(SystemAccess sys){
                             try{
                               Location loc = sys.getTree(SystemTree.Geographic).resolve(tm.persistentIdentifier);

src/aces/webctrl/postgresql/core/TableCache.java

@@ -130,7 +130,7 @@ public class TableCache {
       //trend_mappings
       x = new TableTemplate("trend_mappings", "Trend Mappings");
       x.keyColumn = "id";
-      x.otherColumns = "\"server_id\",\"name\",\"persistent_identifier\",\"retain_data\"";
+      x.otherColumns = "\"server_id\",\"name\",\"persistent_identifier\",\"retain_data\",\"field_access\"";
       x.query =
         "SELECT\n"+
         "  \"x\".\"id\",\n"+
@@ -139,6 +139,7 @@ public class TableCache {
         "  \"x\".\"name\",\n"+
         "  \"x\".\"persistent_identifier\",\n"+
         "  \"x\".\"retain_data\",\n"+
+        "  \"x\".\"field_access\",\n"+
         "  COALESCE(\"y\".\"sample_count\", 0) AS \"sample_count\",\n"+
         "  COALESCE(DATE_TRUNC('seconds', \"y\".\"first_sample\" AT TIME ZONE '"+timezone+"')::TEXT, 'N/A') AS \"first_sample\",\n"+
         "  COALESCE(DATE_TRUNC('seconds', \"y\".\"last_sample\" AT TIME ZONE '"+timezone+"')::TEXT, 'N/A') AS \"last_sample\"\n"+
@@ -158,14 +159,16 @@ public class TableCache {
         ") \"z\"\n"+
         "ON \"x\".\"server_id\" = \"z\".\"id\"\n"+
         "ORDER BY \"x\".\"server_id\";";
-      x.header = "[\"Trend ID\",\"Server ID\",\"Server Name\",\"Name\",\"Persistent Identifier\",\"Retain Data (Days)\",\"Sample Count\",\"First Sample\",\"Last Sample\"],"+
-        "[\"<READONLY>N/A\",\"^\\\\d+$\",\"<READONLY>N/A\",\"^.+$\",\"^.+$\",\"^\\\\d+$\",\"<READONLY>0\",\"<READONLY>N/A\",\"<READONLY>N/A\"]";
+      x.header = "[\"Trend ID\",\"Server ID\",\"Server Name\",\"Name\",\"Persistent Identifier\",\"Retain Data (Days)\",\"Field Access\",\"Sample Count\",\"First Sample\",\"Last Sample\"],"+
+        "[\"<READONLY>N/A\",\"^\\\\d+$\",\"<READONLY>N/A\",\"^.+$\",\"^.+$\",\"^\\\\d+$\",\"^true$|^false$\",\"<READONLY>0\",\"<READONLY>N/A\",\"<READONLY>N/A\"]";
       x.conversion = new BiFunction<Integer,String,String>(){
         @Override public String apply(Integer i, String s){
           if (i==0){
             return s.equalsIgnoreCase("N/A")?"DEFAULT":String.valueOf(Integer.parseInt(s));
           }else if (i==1 || i==4){
             return String.valueOf(Integer.parseInt(s));
+          }else if (i==5){
+            return s.equals("1") || s.equalsIgnoreCase("true") ? "TRUE":"FALSE";
           }else{
             return Utility.escapePostgreSQL(s);
           }

src/aces/webctrl/postgresql/core/TrendMapping.java

@@ -3,5 +3,6 @@
 public class TrendMapping {
   public volatile int ID;
   public volatile String persistentIdentifier;
+  public volatile boolean fieldAccess;
   public volatile Date start;
 }

src/aces/webctrl/postgresql/resources/Setup.sql

@@ -192,7 +192,9 @@ CREATE TABLE webctrl.trend_mappings (
   -- com.controlj.green.addonsupport.access.Location.getPersistentLookupString(true)
   "persistent_identifier" TEXT,
   -- How many days of historical data should be kept in the database
-  "retain_data" INTEGER
+  "retain_data" INTEGER,
+  -- Whether to collect field data from controllers
+  "field_access" BOOLEAN
 );
 
 -- Where collected trend source data lives
@@ -304,7 +306,7 @@ CREATE TABLE webctrl.settings (
 -- Populate default values for webctrl.settings
 INSERT INTO webctrl.settings VALUES
   -- Version of PostgreSQL connector addon
-  ('version','0.4.4'),
+  ('version','0.4.5'),
   -- Whether debug mode is enabled (e.g, verbose log messages when true)
   ('debug','false'),
   -- Whether to auto-update the PostgreSQL connector addon