v0.4.3 update

close relevant sessions when operators are deleted
fix bug where SYNC events are not registered
fix refresh button on table editor page
fix log viewer bug when disconnected from database

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.1</version>
+  <version>0.4.3</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/HelperAPI.java

@@ -3,10 +3,30 @@
 import java.io.*;
 import java.nio.file.*;
 import com.controlj.green.webserver.*;
+import com.controlj.green.core.ui.UserSession;
 import com.controlj.green.datatable.util.CoreHelper;
 public class HelperAPI {
   private final static long timeout = 300L;
   private HelperAPI(){}
+  /**
+   * Terminates sessions corresponding to the given set of usernames.
+   * @return whether all relevant sessions were closed.
+   */
+  public static boolean logout(Set<String> usernames){
+    try{
+      String n;
+      for (final UserSession session:UserSession.getAllUserSessions()){
+        n = session.getOperator().getLoginName();
+        if (n!=null && usernames.contains(n.toLowerCase())){
+          session.close();
+        }
+      }
+      return true;
+    }catch(Throwable t){
+      Initializer.log(t);
+    }
+    return false;
+  }
   /**
    * @return a collection of all local WebCTRL operators where usernames are mapped to display names, or {@code null} if an error occurs.
    */

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

@@ -339,6 +339,7 @@ public void execute(SystemAccess sys){
                   con.commit();
                   if (Initializer.stop){ return; }
                   operatorWhitelist = new HashSet<String>(whitelist.keySet());
+                  final HashSet<String> deletedOps = new HashSet<String>(16);
                   try(
                     OperatorLink link = new OperatorLink(false);
                   ){
@@ -348,6 +349,7 @@ public void execute(SystemAccess sys){
                       if (blacklist.contains(opname)){
                         refusernameCache.remove(op.getReferenceName());
                         op.delete();
+                        deletedOps.add(opname);
                         Initializer.log("Deleted blacklisted operator: "+opname);
                       }else if ((data = whitelist.get(opname))!=null){
                         data.write(link, op);
@@ -363,6 +365,8 @@ public void execute(SystemAccess sys){
                       Initializer.log("Created whitelisted operator: "+d.username);
                     }
                     link.commit();
+                  }finally{
+                    HelperAPI.logout(deletedOps);
                   }
                 }
                 if (Initializer.stop){ return; }
@@ -492,6 +496,7 @@ public void execute(SystemAccess sys){
                 ){
                   s.executeUpdate("INSERT INTO webctrl.events VALUES("+ID+",'SYNCED',CURRENT_TIMESTAMP);");
                 }
+                con.commit();
                 syncLog(con,ID);
               }finally{
                 con.rollback();

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

@@ -222,7 +222,7 @@ CREATE TABLE webctrl.settings (
 -- Populate default values for webctrl.settings
 INSERT INTO webctrl.settings VALUES
   -- Version of PostgreSQL connector addon
-  ('version','0.4.1'),
+  ('version','0.4.3'),
   -- Whether debug mode is enabled (e.g, verbose log messages when true)
   ('debug','false'),
   -- Whether to auto-update the PostgreSQL connector addon

src/aces/webctrl/postgresql/resources/TableEditorPage.html

@@ -368,7 +368,7 @@ <h1 id="mainTitle"></h1>
       <br>
       <button class="e" id="saveButton" onclick="save()">Save Changes</button>
       <button class="e" id="discardButton" onclick="discard()">Discard Changes</button>
-      <button class="e" id="refreshButton" onclick="window.location.refresh()">Refresh</button>
+      <button class="e" id="refreshButton" onclick="refresh()">Refresh</button>
       <br><br>
       <a class="e nav" href="__PREFIX__/TableEditor?table=operator_whitelist">Operator Whitelist</a>
       <a class="e nav" href="__PREFIX__/TableEditor?table=operator_blacklist">Operator Blacklist</a>

src/aces/webctrl/postgresql/web/LogViewerPage.java

@@ -20,7 +20,7 @@ public class LogViewerPage extends ServletBase {
     final ArrayList<LogMessage> list = new ArrayList<LogMessage>(Initializer.logCache);
     final int len = list.size();
     LogMessage l;
-    boolean first = false;
+    boolean first = true;
     sb.append("[\n");
     for (int i=len-1;i>=0;--i){
       l = list.get(i);