Update log

jd-opensource · Jan 10, 2025 · 7cc0b37 · 7cc0b37
1 parent 4b41b49
commit 7cc0b37
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 34 deletions.
diff --git a/deploy/all-cr.yaml b/deploy/all-cr.yaml
@@ -433,7 +433,7 @@ data:
         JAVA_TOOL_OPTIONS: -javaagent:/joylive/live.jar
   logback.xml: |
     <?xml version="1.0" encoding="UTF-8"?>
-    <configuration scan="true" debug="false">
+    <configuration scan="true" scanPeriod="10 seconds" debug="false">
         <statusListener class="com.jd.live.agent.shaded.ch.qos.logback.core.status.NopStatusListener"/>
     
         <conversionRule conversionWord="clr"
@@ -444,19 +444,21 @@ data:
                         converterClass="com.jd.live.agent.implement.logger.slf4j.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     
         <property name="LIVE_LOG_CONSOLE_PATTERN"
-                  value="${LIVE_LOG_CONSOLE_PATTERN:-%clr(%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LIVE_LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){red} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+                  value="${LIVE_LOG_CONSOLE_PATTERN:-%clr(%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LIVE_LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){red} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} [LiveAgent] %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
         <property name="LIVE_LOG_CONSOLE_CHARSET" value="${LIVE_LOG_CONSOLE_CHARSET:-${file.encoding:-UTF-8}}"/>
         <property name="LIVE_LOG_FILE_PATTERN"
                   value="${LIVE_LOG_FILE_PATTERN:-%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LIVE_LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
         <property name="LIVE_LOG_FILE_CHARSET" value="${LIVE_LOG_FILE_CHARSET:-${file.encoding:-UTF-8}}"/>
     
-        <property scope="context" name="logger.dir" value="${LIVE_LOG_DIR:-./logs/live-agent/}"/>
-        <property scope="context" name="logger.application" value="${LIVE_APP_NAME:-live-agent}"/>
+        <property scope="context" name="logger.dir" value="${LIVE_LOG_DIR}"/>
+        <property scope="context" name="logger.application" value="${LIVE_APP_NAME}"/>
         <property scope="context" name="logger.level" value="${LIVE_LOG_LEVEL:-info}"/>
-        <property scope="context" name="logger.totalSize" value="${LIVE_LOG_TOTAL_SIZE:-20GB}"/>
-        <property scope="context" name="logger.maxHistory" value="${LIVE_LOG_MAX_HISTORY:-10}"/>
-        <property scope="context" name="logger.maxFileSize" value="${LIVE_LOG_MAX_SIZE:-10MB}"/>
-        <property scope="context" name="logger.cleanHistoryOnStart" value="${LIVE_LOG_CLEAN_HISTORY_ONSTART:-true}"/>
+        <property scope="context" name="logger.advice.level" value="${LIVE_LOG_ADVICE_LEVEL:-${logger.level}}"/>
+        <property scope="context" name="logger.totalSize" value="${LIVE_LOG_TOTAL_SIZE:-10GB}"/>
+        <property scope="context" name="logger.maxHistory" value="${LIVE_LOG_MAX_HISTORY:-30}"/>
+        <property scope="context" name="logger.maxFileSize" value="${LIVE_LOG_MAX_SIZE:-1GB}"/>
+        <property scope="context" name="logger.fileName" value="${LIVE_LOG_FILE_NAME:-${logger.dir}/live-agent.log}"/>
+        <property scope="context" name="logger.fileNamePattern" value="${LIVE_LOG_FILE_NAME_PATTERN:-${logger.fileName}.%d{yyyyMMdd}.%i}"/>
     
         <appender name="CONSOLE_APPENDER" class="com.jd.live.agent.shaded.ch.qos.logback.core.ConsoleAppender">
             <encoder>
@@ -467,27 +469,24 @@ data:
         </appender>
     
         <appender name="ROLLING_APPENDER" class="com.jd.live.agent.shaded.ch.qos.logback.core.rolling.RollingFileAppender">
+            <File>${logger.fileName}</File>
             <rollingPolicy class="com.jd.live.agent.shaded.ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-                <fileNamePattern>${logger.dir}/%d{yyyy-MM-dd}/${logger.application}-%i.log</fileNamePattern>
+                <fileNamePattern>${logger.fileNamePattern}</fileNamePattern>
                 <maxHistory>${logger.maxHistory}</maxHistory>
                 <maxFileSize>${logger.maxFileSize}</maxFileSize>
                 <totalSizeCap>${logger.totalSize}</totalSizeCap>
-                <cleanHistoryOnStart>${logger.cleanHistoryOnStart}</cleanHistoryOnStart>
             </rollingPolicy>
-            <filter class="com.jd.live.agent.shaded.ch.qos.logback.classic.filter.ThresholdFilter">
-                <level>INFO</level>
-            </filter>
             <encoder>
                 <pattern>
                     ${LIVE_LOG_FILE_PATTERN}
                 </pattern>
             </encoder>
         </appender>
     
-        <root>
-            <level value="${logger.level}"/>
-            <appender-ref ref="CONSOLE_APPENDER"/>
-            <appender-ref ref="ROLLING_APPENDER"/>
+        <logger name="com.jd.live.agent.bootstrap.bytekit.advice.AdviceHandler" level="${logger.advice.level}"/>
+    
+        <root level="${logger.level}">
+            <appender-ref ref="${LIVE_LOG_APPENDER:-ROLLING_APPENDER}"/>
         </root>
     
     </configuration>

diff --git a/deploy/joylive-injector/config/logback.xml b/deploy/joylive-injector/config/logback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" debug="false">
+<configuration scan="true" scanPeriod="10 seconds" debug="false">
     <statusListener class="com.jd.live.agent.shaded.ch.qos.logback.core.status.NopStatusListener"/>
 
     <conversionRule conversionWord="clr"
@@ -10,19 +10,21 @@
                     converterClass="com.jd.live.agent.implement.logger.slf4j.logback.ExtendedWhitespaceThrowableProxyConverter"/>
 
     <property name="LIVE_LOG_CONSOLE_PATTERN"
-              value="${LIVE_LOG_CONSOLE_PATTERN:-%clr(%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LIVE_LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){red} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+              value="${LIVE_LOG_CONSOLE_PATTERN:-%clr(%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LIVE_LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){red} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} [LiveAgent] %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <property name="LIVE_LOG_CONSOLE_CHARSET" value="${LIVE_LOG_CONSOLE_CHARSET:-${file.encoding:-UTF-8}}"/>
     <property name="LIVE_LOG_FILE_PATTERN"
               value="${LIVE_LOG_FILE_PATTERN:-%d{${LIVE_LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LIVE_LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LIVE_LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <property name="LIVE_LOG_FILE_CHARSET" value="${LIVE_LOG_FILE_CHARSET:-${file.encoding:-UTF-8}}"/>
 
-    <property scope="context" name="logger.dir" value="${LIVE_LOG_DIR:-./logs/live-agent/}"/>
-    <property scope="context" name="logger.application" value="${LIVE_APP_NAME:-live-agent}"/>
+    <property scope="context" name="logger.dir" value="${LIVE_LOG_DIR}"/>
+    <property scope="context" name="logger.application" value="${LIVE_APP_NAME}"/>
     <property scope="context" name="logger.level" value="${LIVE_LOG_LEVEL:-info}"/>
-    <property scope="context" name="logger.totalSize" value="${LIVE_LOG_TOTAL_SIZE:-20GB}"/>
-    <property scope="context" name="logger.maxHistory" value="${LIVE_LOG_MAX_HISTORY:-10}"/>
-    <property scope="context" name="logger.maxFileSize" value="${LIVE_LOG_MAX_SIZE:-10MB}"/>
-    <property scope="context" name="logger.cleanHistoryOnStart" value="${LIVE_LOG_CLEAN_HISTORY_ONSTART:-true}"/>
+    <property scope="context" name="logger.advice.level" value="${LIVE_LOG_ADVICE_LEVEL:-${logger.level}}"/>
+    <property scope="context" name="logger.totalSize" value="${LIVE_LOG_TOTAL_SIZE:-10GB}"/>
+    <property scope="context" name="logger.maxHistory" value="${LIVE_LOG_MAX_HISTORY:-30}"/>
+    <property scope="context" name="logger.maxFileSize" value="${LIVE_LOG_MAX_SIZE:-1GB}"/>
+    <property scope="context" name="logger.fileName" value="${LIVE_LOG_FILE_NAME:-${logger.dir}/live-agent.log}"/>
+    <property scope="context" name="logger.fileNamePattern" value="${LIVE_LOG_FILE_NAME_PATTERN:-${logger.fileName}.%d{yyyyMMdd}.%i}"/>
 
     <appender name="CONSOLE_APPENDER" class="com.jd.live.agent.shaded.ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -33,27 +35,24 @@
     </appender>
 
     <appender name="ROLLING_APPENDER" class="com.jd.live.agent.shaded.ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${logger.fileName}</File>
         <rollingPolicy class="com.jd.live.agent.shaded.ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logger.dir}/%d{yyyy-MM-dd}/${logger.application}-%i.log</fileNamePattern>
+            <fileNamePattern>${logger.fileNamePattern}</fileNamePattern>
             <maxHistory>${logger.maxHistory}</maxHistory>
             <maxFileSize>${logger.maxFileSize}</maxFileSize>
             <totalSizeCap>${logger.totalSize}</totalSizeCap>
-            <cleanHistoryOnStart>${logger.cleanHistoryOnStart}</cleanHistoryOnStart>
         </rollingPolicy>
-        <filter class="com.jd.live.agent.shaded.ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
         <encoder>
             <pattern>
                 ${LIVE_LOG_FILE_PATTERN}
             </pattern>
         </encoder>
     </appender>
 
-    <root>
-        <level value="${logger.level}"/>
-        <appender-ref ref="CONSOLE_APPENDER"/>
-        <appender-ref ref="ROLLING_APPENDER"/>
+    <logger name="com.jd.live.agent.bootstrap.bytekit.advice.AdviceHandler" level="${logger.advice.level}"/>
+
+    <root level="${logger.level}">
+        <appender-ref ref="${LIVE_LOG_APPENDER:-ROLLING_APPENDER}"/>
     </root>
 
 </configuration>
diff --git a/deploy/packages/joylive-injector-1.3.6.tgz b/deploy/packages/joylive-injector-1.3.6.tgz