瀏覽代碼

update loggers.

deason 4 年之前
父節點
當前提交
aa90e478ca

+ 5 - 5
examcloud-core-reports-api-provider/src/main/java/cn/com/qmth/examcloud/core/reports/api/listener/RocketMqConsumerListener.java

@@ -30,7 +30,7 @@ import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 
 public class RocketMqConsumerListener {
-	private final static Logger logger = LoggerFactory.getLogger(RocketMqConsumerListener.class);
+	private final static Logger LOG = LoggerFactory.getLogger(RocketMqConsumerListener.class);
 
 	private static OperateService operateService = SpringContextHolder.getBean(OperateService.class);
 
@@ -67,7 +67,7 @@ public class RocketMqConsumerListener {
 					onMessageExamStudent(msg);
 					return Action.CommitMessage;
 				} catch (Exception e) {
-					logger.error("consumer failed MsgID:" + message.getMsgID(), e);
+					LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
 					return Action.ReconsumeLater;
 				}
 			}
@@ -88,7 +88,7 @@ public class RocketMqConsumerListener {
 					onMessageStudent(msg);
 					return Action.CommitMessage;
 				} catch (Exception e) {
-					logger.error("consumer failed MsgID:" + message.getMsgID(), e);
+					LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
 					return Action.ReconsumeLater;
 				}
 			}
@@ -109,7 +109,7 @@ public class RocketMqConsumerListener {
 					onMessageUser(msg);
 					return Action.CommitMessage;
 				} catch (Exception e) {
-					logger.error("consumer failed MsgID:" + message.getMsgID(), e);
+					LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
 					return Action.ReconsumeLater;
 				}
 			}
@@ -130,7 +130,7 @@ public class RocketMqConsumerListener {
 					onOperateInfo(msg, message.getMsgID());
 					return Action.CommitMessage;
 				} catch (Exception e) {
-					logger.error("consumer failed MsgID:" + message.getMsgID(), e);
+					LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
 					return Action.ReconsumeLater;
 				}
 			}

+ 3 - 3
examcloud-core-reports-base/src/main/java/cn/com/qmth/examcloud/core/reports/base/util/excel/ExportUtils.java

@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
  * excel导出工具
  */
 public class ExportUtils {
-	private static final Logger logger = LoggerFactory.getLogger(ExportUtils.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ExportUtils.class);
 	private static final String DEFALUT_CONTENT_TYPE = "application/vnd.ms-excel";
 
 	private static final String DEFALUT_EXT = ".xlsx";
@@ -126,12 +126,12 @@ public class ExportUtils {
 			}
 			workbook.write(out);
 		} catch (Exception e) {
-			logger.error("导出出错", e);
+			LOG.error("导出出错", e);
 		} finally {
 			try {
 				workbook.close();
 			} catch (IOException e) {
-				logger.error("workbook close 出错", e);
+				LOG.error("workbook close 出错", e);
 			}
 		}
 

+ 2 - 2
examcloud-core-reports-starter/src/main/java/cn/com/qmth/examcloud/core/reports/starter/config/MqConsumerListenerStartup.java

@@ -14,7 +14,7 @@ import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 @Component
 @Order(999)
 public class MqConsumerListenerStartup implements ApplicationRunner {
-	private final static Logger logger = LoggerFactory.getLogger(MqConsumerListenerStartup.class);
+	private final static Logger LOG = LoggerFactory.getLogger(MqConsumerListenerStartup.class);
 	private void startConsumerListener() {
 
 		String mqType = PropertyHolder.getString("$report.mq-type");
@@ -25,7 +25,7 @@ public class MqConsumerListenerStartup implements ApplicationRunner {
 			if(MqType.ROCKETMQ.getCode().equals(mqType)) {
 				RocketMqConsumerListener.start();
 			}else {
-				logger.error("no $report.mq-type property config!");
+				LOG.error("no $report.mq-type property config!");
 			}
 		}
 

+ 18 - 39
examcloud-core-reports-starter/src/main/resources/log4j2.xml

@@ -2,47 +2,31 @@
 <Configuration status="WARN" monitorInterval="30">
 
     <Properties>
-        <Property name="commonLevel" value="${sys:log.commonLevel}"/>
-        <Property name="logPattern">
+        <Property name="LOG_LEVEL" value="${sys:log.commonLevel}"/>
+        <Property name="LOG_DIR" value="./logs/examcloud-core-reports"/>
+        <Property name="LOG_PATTERN">
             %d{yyyy-MM-dd HH:mm:ss.SSS} | %clr{%level} | %X{TRACE_ID} %X{CALLER} | %clr{%c{1.1}:%L}{cyan} | %m%n
         </Property>
     </Properties>
 
     <Appenders>
-        <!-- 控制台 日志 -->
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
+        <Console name="CONSOLE_APPENDER" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
         </Console>
 
-        <!-- debug 日志 -->
-        <RollingFile name="DEBUG_APPENDER"
-                     fileName="./logs/debug/debug.log"
-                     filePattern="./logs/debug/debug-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/debug" maxDepth="1">
-                    <IfFileName glob="debug-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
+        <RollingFile name="FILE_APPENDER"
+                     fileName="${LOG_DIR}/debug.log"
+                     filePattern="${LOG_DIR}/debug-%d{yyyyMMdd}-%i.log">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
 
-        <!-- 接口日志 -->
-        <RollingFile name="INTERFACE_APPENDER" fileName="./logs/interface/interface.log"
-                     filePattern="./logs/interface/interface-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
+
             <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/interface" maxDepth="1">
-                    <IfFileName glob="interface-*.log">
+                <Delete basePath="${LOG_DIR}" maxDepth="1">
+                    <IfFileName glob="debug-*.log">
                         <IfAccumulatedFileSize exceeds="10 GB"/>
                     </IfFileName>
                 </Delete>
@@ -67,19 +51,14 @@
         <!--<logger name="org.springframework.data.mongodb" level="DEBUG"/>-->
         <!--<logger name="org.springframework.data.redis" level="DEBUG"/>-->
 
-        <Logger name="cn.com.qmth" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="DEBUG_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="INTERFACE_LOGGER" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="INTERFACE_APPENDER"/>
-            <AppenderRef ref="Console"/>
+        <Logger name="cn.com.qmth" level="${LOG_LEVEL}" additivity="false">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Logger>
 
-        <Root level="${commonLevel}">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="DEBUG_APPENDER"/>
+        <Root level="${LOG_LEVEL}">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Root>
     </Loggers>