From 9f4a7becd27034b71b20fbf3f94bd741edbd46c9 Mon Sep 17 00:00:00 2001 From: zhourui Date: Thu, 1 Jul 2021 15:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9requestLogRetainDays=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x/base/core/project/config/ApplicationServer.java | 10 +++++++++- .../com/x/base/core/project/config/CenterServer.java | 11 +++++++++++ .../com/x/base/core/project/config/WebServer.java | 9 +++++++++ .../server/application/ApplicationServerTools.java | 1 + .../console/server/center/CenterServerTools.java | 1 + .../x/server/console/server/web/WebServerTools.java | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java index 4b33062908..127087033f 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java @@ -25,6 +25,7 @@ public class ApplicationServer extends ConfigObject { private static final Integer DEFAULT_MAXTHREAD = 500; private static final Boolean DEFAULT_REQUESTLOGENABLE = false; private static final String DEFAULT_REQUESTLOGFORMAT = ""; + private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7; public ApplicationServer() { this.enable = true; @@ -44,9 +45,9 @@ public class ApplicationServer extends ConfigObject { this.exposeJest = DEFAULT_EXPOSEJEST; this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE; this.maxThread = DEFAULT_MAXTHREAD; - this.maxThread = DEFAULT_MAXTHREAD; this.requestLogEnable = DEFAULT_REQUESTLOGENABLE; this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT; + this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS; } @FieldDescribe("是否启用") @@ -85,6 +86,8 @@ public class ApplicationServer extends ConfigObject { private Boolean requestLogEnable; @FieldDescribe("访问日志记录格式.") private String requestLogFormat; + @FieldDescribe("访问日志记录天数,默认7天.") + private Integer requestLogRetainDays; @FieldDescribe("是否启用长连接,默认true.") private Boolean persistentConnectionsEnable; @@ -265,4 +268,9 @@ public class ApplicationServer extends ConfigObject { return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat; } + public Integer getRequestLogRetainDays() { + return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS + : this.requestLogRetainDays; + } + } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java index 7c3b5da71c..44ef027d02 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java @@ -13,6 +13,8 @@ import com.x.base.core.project.tools.DefaultCharset; public class CenterServer extends ConfigObject { + private static final long serialVersionUID = 8147826320846595611L; + private static final Boolean DEFAULT_ENABLE = true; private static final Integer DEFAULT_PORT = 20030; private static final Integer DEFAULT_SCANINTERVAL = 0; @@ -25,6 +27,7 @@ public class CenterServer extends ConfigObject { private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true; private static final Boolean DEFAULT_REQUESTLOGENABLE = false; private static final String DEFAULT_REQUESTLOGFORMAT = ""; + private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7; public static CenterServer defaultInstance() { return new CenterServer(); @@ -48,6 +51,7 @@ public class CenterServer extends ConfigObject { this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE; this.requestLogEnable = DEFAULT_REQUESTLOGENABLE; this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT; + this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS; } @FieldDescribe("是否启用") @@ -84,6 +88,8 @@ public class CenterServer extends ConfigObject { private Boolean requestLogEnable; @FieldDescribe("访问日志记录格式.") private String requestLogFormat; + @FieldDescribe("访问日志记录天数,默认7天.") + private Integer requestLogRetainDays; @FieldDescribe("是否启用长连接,默认false.") private Boolean persistentConnectionsEnable; @@ -210,4 +216,9 @@ public class CenterServer extends ConfigObject { return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat; } + public Integer getRequestLogRetainDays() { + return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS + : this.requestLogRetainDays; + } + } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java index c2f927bb8a..1e0b55612a 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java @@ -27,6 +27,7 @@ public class WebServer extends ConfigObject { this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE; this.requestLogEnable = DEFAULT_REQUESTLOGENABLE; this.requestLogFormat = DEFAULT_REQUESTLOGFORMAT; + this.requestLogRetainDays = DEFAULT_REQUESTLOGRETAINDAYS; } private static final Integer DEFAULT_HTTP_PORT = 80; @@ -41,6 +42,7 @@ public class WebServer extends ConfigObject { private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true; private static final Boolean DEFAULT_REQUESTLOGENABLE = false; private static final String DEFAULT_REQUESTLOGFORMAT = ""; + private static final Integer DEFAULT_REQUESTLOGRETAINDAYS = 7; @FieldDescribe("是否启用") private Boolean enable; @@ -76,6 +78,8 @@ public class WebServer extends ConfigObject { private Boolean requestLogEnable; @FieldDescribe("访问日志记录格式.") private String requestLogFormat; + @FieldDescribe("访问日志记录天数,默认7天.") + private Integer requestLogRetainDays; public Boolean getPersistentConnectionsEnable() { return persistentConnectionsEnable == null ? DEFAULT_PERSISTENTCONNECTIONSENABLE @@ -189,4 +193,9 @@ public class WebServer extends ConfigObject { return StringUtils.isEmpty(this.requestLogFormat) ? "" : this.requestLogFormat; } + public Integer getRequestLogRetainDays() { + return (null == this.requestLogRetainDays || this.requestLogRetainDays < 1) ? DEFAULT_REQUESTLOGRETAINDAYS + : this.requestLogRetainDays; + } + } diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java index c77f86c028..32552897a0 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java +++ b/o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java @@ -163,6 +163,7 @@ public class ApplicationServerTools extends JettySeverTools { AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter(); asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd"); asyncRequestLogWriter.setAppend(true); + asyncRequestLogWriter.setRetainDays(applicationServer.getRequestLogRetainDays()); asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".application.request.log"); String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z") diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java index cd5ce263dc..a397cd6a85 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java +++ b/o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java @@ -125,6 +125,7 @@ public class CenterServerTools extends JettySeverTools { AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter(); asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd"); asyncRequestLogWriter.setAppend(true); + asyncRequestLogWriter.setRetainDays(centerServer.getRequestLogRetainDays()); asyncRequestLogWriter.setFilename( Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".center.request.log"); String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z") diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java index e9d362222f..ed41ae584d 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java +++ b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java @@ -130,6 +130,7 @@ public class WebServerTools extends JettySeverTools { AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter(); asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd"); asyncRequestLogWriter.setAppend(true); + asyncRequestLogWriter.setRetainDays(webServer.getRequestLogRetainDays()); asyncRequestLogWriter.setFilename( Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".web.request.log"); String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z") -- GitLab