Changeset 8129

Timestamp:

Mar 14, 2023, 11:42:59 AM (7 months ago)

Author:

Nicklas Nordborg

Message:

References #2295: Add API for services to send log messages that can be displayed by the web client

Added an "Update" button to the "View log" dialog.

Location:

branches/3.19-stable

Files:

• src/core/net/sf/basedb/util/extensions/logging/ExtensionsLog.java (modified) (1 diff)
• www/admin/extensions/details.jsp (modified) (2 diffs)
• www/admin/extensions/view_log.js (modified) (1 diff)
• www/admin/extensions/view_log.jsp (modified) (2 diffs)

branches/3.19-stable/src/core/net/sf/basedb/util/extensions/logging/ExtensionsLog.java

@@ -232 +232 @@
       if (entry.getLevel() == LogLevel.ERROR) numErrors++;
       
-      if (numEntries++ > maxEntries)
+      if (++numEntries > maxEntries)
       {
         // Remove one entry

branches/3.19-stable/www/admin/extensions/details.jsp

@@ -149 +149 @@
       String logIcon = "service_log.png";
       String logSummary = "This extension doesn't have any log";
+      int numEntries = 0;
       ExtensionsLog log = ExtensionsLog.getLog(extensionId, false);
       if (log != null)
       {
+        numEntries = log.getNumEntries();
         logSummary = "View the log for this extension; "+
-          log.getNumEntries() +" entries; " + 
+          numEntries +" entries; " + 
           log.getNumErrors()+" errors; "+
           log.getNumWarnings()+" warnings";
@@ -181 +183 @@
         tooltip="<%=logSummary%>"
         visible="<%=log != null%>"
-        title="View log&hellip;"
+        title="<%="View log ("+numEntries+")&hellip;"%>"
       />
       <tbl:button

branches/3.19-stable/www/admin/extensions/view_log.js

@@ -32 +32 @@
     // Close button
     Buttons.addClickHandler('close', App.closeWindow);
-      
+    
+    Buttons.addClickHandler('btnUpdate', App.reloadWindow);
     Buttons.addClickHandler('btnClearLog', vlog.clearLog);
     Events.addEventHandler('enableDebug', 'change', vlog.setOptions);

branches/3.19-stable/www/admin/extensions/view_log.jsp

@@ -87 +87 @@
         <tbl:toolbar>
           <tbl:button
+            id="btnUpdate"
+            title="Update"
+            image="refresh.png"
+            tooltip="Re-load this page"
+          />
+          <tbl:button
             id="btnClearLog"
             title="Clear the log"
             image="delete.png"
+            tooltip="Delete all entries from the log"
           />
           <tbl:label style="padding-right: 1em;">
@@ -151 +158 @@
           <%
         }
+        if (entryNo == 0)
+        {
+          %>
+          <tbl:panel subclass="bg-filled-50">
+            <div class="messagecontainer note">
+            No entries in this log.
+            </div>
+          </tbl:panel>
+          <%
+        }
         %>
         </tbl:rows>