Changeset 8118

Timestamp:

Feb 22, 2023, 3:12:58 PM (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 ServiceLog class which is intended to be the main class for keeping the log for a single extension.

Location:

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service

Files:

• DummyService.java (modified) (1 diff)
• ServiceLog.java (added)
• ServiceLogger.java (modified) (2 diffs)
• ServicesEventHandler.java (modified) (1 diff)
• StartServiceRenderer.java (modified) (2 diffs)
• StopServiceRenderer.java (modified) (2 diffs)

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service/DummyService.java

@@ -25 +25 @@
 import java.util.TimerTask;
 
-import net.sf.basedb.clients.web.extensions.service.ServiceLogger.LogLevel;
+import net.sf.basedb.clients.web.extensions.service.ServiceLog.LogLevel;
 import net.sf.basedb.core.Application;
 import net.sf.basedb.util.Values;

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service/ServiceLogger.java

@@ -1 +1 @@
 package net.sf.basedb.clients.web.extensions.service;
+
+import net.sf.basedb.clients.web.extensions.service.ServiceLog.LogLevel;
+import net.sf.basedb.clients.web.extensions.service.ServiceLog.LogEntry;
 
 /**
@@ -19 +22 @@
 public class ServiceLogger 
 {
-  private final String extensionId;
+  private final ServiceLog log;
   
-  ServiceLogger(String extensionId)
+  ServiceLogger(ServiceLog log)
   {
-    this.extensionId = extensionId;
+    this.log = log;
+  }
+  
+  public boolean isDebugEnabled()
+  {
+    return log.isDebugEnabled();
   }
   
   public void log(LogLevel level, String msg)
   {
-    // TODO 
-    System.out.println(extensionId+" [" + level.name()+"]: "+msg);
+    log.add(new LogEntry(level, msg, null));
   }
   
-  public void log(LogLevel level, String msg, Throwable stacktrace)
+  public void log(LogLevel level, String msg, Throwable t)
   {
-    // TODO 
-    System.out.println(extensionId+" [" + level.name()+"]: "+msg);
-    if (stacktrace != null)
-    {
-      stacktrace.printStackTrace(System.out);
-    }
+    log.add(new LogEntry(level, msg, t));
   }
   
-  /**
-    The level of the log message.
-  */
-  public enum LogLevel
-  {
-    INFO,
-    WARNING,
-    ERROR,
-    DEBUG
-  }
-
 }

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service/ServicesEventHandler.java

@@ -56 +56 @@
   public void handleEvent(EventType event, ExtensionPoint<?> extensionPoint, Extension<?> extension)
   {
-    System.out.println("handleEvent:"+event+": " + extension.getId());
     if (log.isInfoEnabled())
     {

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service/StartServiceRenderer.java

@@ -22 +22 @@
 package net.sf.basedb.clients.web.extensions.service;
 
-import net.sf.basedb.clients.web.extensions.service.ServiceLogger.LogLevel;
+import net.sf.basedb.clients.web.extensions.service.ServiceLog.LogLevel;
 import net.sf.basedb.util.extensions.AbstractRenderer;
 import net.sf.basedb.util.extensions.Extension;
@@ -50 +50 @@
   {
     log.info("Starting service: " + service);
-    ServiceLogger logger = new ServiceLogger(ext.getId());
+    ServiceLogger logger = ServiceLog.getLogger(ext.getId(), true);
     service.start(logger);
     logger.log(LogLevel.INFO, "Service started");

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/service/StopServiceRenderer.java

@@ -22 +22 @@
 package net.sf.basedb.clients.web.extensions.service;
 
-import net.sf.basedb.clients.web.extensions.service.ServiceLogger.LogLevel;
 import net.sf.basedb.util.extensions.Extension;
+import net.sf.basedb.clients.web.extensions.service.ServiceLog.LogLevel;
 import net.sf.basedb.util.extensions.AbstractRenderer;
 
@@ -52 +52 @@
     log.info("Stopping service: " + service);
     service.stop();
-    ServiceLogger logger = new ServiceLogger(ext.getId()); // TODO -- we need information about the extension!
-    logger.log(LogLevel.INFO, "Service stopped");
+    ServiceLogger logger = ServiceLog.getLogger(ext.getId(), false);
+    if (logger != null) logger.log(LogLevel.INFO, "Service stopped");
     log.info("Stopping service done: " + service);
   }