添加ReportAway上报方式

Author: hengboy

api-boot-project/api-boot-plugins/api-boot-plugin-logging/src/main/java/org/minbox/framework/api/boot/plugin/logging/admin/report/LoggingAdminReport.java

@@ -18,8 +18,11 @@
 package org.minbox.framework.api.boot.plugin.logging.admin.report;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
+import org.minbox.framework.api.boot.plugin.logging.ApiBootLog;
 import org.springframework.beans.factory.InitializingBean;
 
+import java.util.List;
+
 /**
  * Batch Report Request Logs To Admin
  *
@@ -34,8 +37,17 @@
 public interface LoggingAdminReport extends InitializingBean {
     /**
      * Report Request Logs To Admin
+     * Loading a specified number of logs from the cache
      *
      * @throws ApiBootException ApiBoot Exception
      */
     void report() throws ApiBootException;
+
+    /**
+     * Report Specified Request Logs
+     *
+     * @param logs Request Logs
+     * @throws ApiBootException ApiBoot Exception
+     */
+    void report(List<ApiBootLog> logs) throws ApiBootException;
 }

api-boot-project/api-boot-plugins/api-boot-plugin-logging/src/main/java/org/minbox/framework/api/boot/plugin/logging/admin/report/support/LoggingAdminReportSupport.java

@@ -114,11 +114,19 @@ public LoggingAdminReportSupport(LoggingAdminDiscovery adminDiscovery, RestTempl
      */
     @Override
     public void report() throws ApiBootException {
+        List<ApiBootLog> logs = null;
         try {
-            List<ApiBootLog> logs = loggingCache.getLogs(numberOfRequestLog);
-            reportToAdmin(logs);
-        } catch (Exception e) {
+            // get log from cache
+            logs = loggingCache.getLogs(numberOfRequestLog);
+            // execute report
+            report(logs);
+        }
+        // Recycle the request log when an exception is encountered
+        catch (Exception e) {
             logger.error(e.getMessage(), e);
+            if (!ObjectUtils.isEmpty(logs)) {
+                logs.stream().forEach(log -> loggingCache.cache(log));
+            }
         }
     }
 
@@ -129,9 +137,11 @@ public void report() throws ApiBootException {
      * report request logs ro admin service
      * if admin use spring security, set restTemplate header basic auth info
      *
-     * @param logs
+     * @param logs Request Logs
+     * @throws ApiBootException ApiBoot Exception
      */
-    private void reportToAdmin(List<ApiBootLog> logs) {
+    @Override
+    public void report(List<ApiBootLog> logs) throws ApiBootException {
         if (ObjectUtils.isEmpty(logs)) {
             return;
         }
@@ -190,6 +200,6 @@ public void destroy() throws Exception {
         // get all cache logs
         List<ApiBootLog> logs = loggingCache.getAll();
         // report to admin
-        reportToAdmin(logs);
+        report(logs);
     }
 }

api-boot-project/api-boot-plugins/api-boot-plugin-logging/src/main/java/org/minbox/framework/api/boot/plugin/logging/notice/away/support/ApiBootLoggingAdminStorageNotice.java

@@ -18,11 +18,15 @@
 package org.minbox.framework.api.boot.plugin.logging.notice.away.support;
 
 import org.minbox.framework.api.boot.plugin.logging.ApiBootLog;
+import org.minbox.framework.api.boot.plugin.logging.ReportAway;
+import org.minbox.framework.api.boot.plugin.logging.admin.report.LoggingAdminReport;
 import org.minbox.framework.api.boot.plugin.logging.cache.LoggingCache;
 import org.minbox.framework.api.boot.plugin.logging.notice.away.ApiBootLogStorageNotice;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+
 /**
  * ApiBoot Logging Admin Notice
  * report every request log to api-boot-logging-admin
@@ -44,9 +48,20 @@ public class ApiBootLoggingAdminStorageNotice implements ApiBootLogStorageNotice
      * Logging Cache
      */
     private LoggingCache loggingCache;
+    /**
+     * Report Away
+     */
+    private ReportAway reportAway;
+    /**
+     * Logging Admin Report
+     * report request logs to admin
+     */
+    private LoggingAdminReport loggingAdminReport;
 
-    public ApiBootLoggingAdminStorageNotice(LoggingCache loggingCache) {
+    public ApiBootLoggingAdminStorageNotice(LoggingCache loggingCache, ReportAway reportAway, LoggingAdminReport loggingAdminReport) {
         this.loggingCache = loggingCache;
+        this.reportAway = reportAway;
+        this.loggingAdminReport = loggingAdminReport;
     }
 
     /**
@@ -58,5 +73,11 @@ public ApiBootLoggingAdminStorageNotice(LoggingCache loggingCache) {
     public void notice(ApiBootLog apiBootLog) {
         loggingCache.cache(apiBootLog);
         logger.debug("Cache Request Logging Complete.");
+        // if just report away，execute report logs to admin
+        switch (reportAway) {
+            case just:
+                loggingAdminReport.report(Arrays.asList(apiBootLog));
+                break;
+        }
     }
 }