From be73af576a99631017f5205018d86ead2b87e0f2 Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Tue, 1 Jan 2019 08:31:55 +0800
Subject: [PATCH] added spring log4j2 support

---
 decode-service.iml                            |  8 +++-
 pom.xml                                       | 11 ++++++
 .../irext/decoder/request/OpenRequest.java    | 14 +++----
 .../decoder/service/IRDecodeService.java      | 10 ++++-
 src/main/resources/log4j2-spring.xml          | 37 +++++++++++++++++++
 5 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/log4j2-spring.xml

diff --git a/decode-service.iml b/decode-service.iml
index ee786e6..c75063c 100644
--- a/decode-service.iml
+++ b/decode-service.iml
@@ -31,8 +31,6 @@
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
@@ -109,5 +107,11 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 75bc8f1..42d5c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
             <version>2.1.1.RELEASE</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -64,6 +70,11 @@
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+			<version>2.1.1.RELEASE</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/net/irext/decoder/request/OpenRequest.java b/src/main/java/net/irext/decoder/request/OpenRequest.java
index 261609f..9eb4d0d 100644
--- a/src/main/java/net/irext/decoder/request/OpenRequest.java
+++ b/src/main/java/net/irext/decoder/request/OpenRequest.java
@@ -12,22 +12,22 @@ package net.irext.decoder.request;
  */
 public class OpenRequest {
 
-    private int indexId;
+    private int remoteIndexId;
 
-    public OpenRequest(int indexId) {
-        this.indexId = indexId;
+    public OpenRequest(int remoteIndexId) {
+        this.remoteIndexId = remoteIndexId;
     }
 
     public OpenRequest() {
 
     }
 
-    public int getIndexId() {
-        return indexId;
+    public int getRemoteIndexId() {
+        return remoteIndexId;
     }
 
-    public void setIndexId(int indexId) {
-        this.indexId = indexId;
+    public void setRemoteIndexId(int remoteIndexId) {
+        this.remoteIndexId = remoteIndexId;
     }
 
 }
diff --git a/src/main/java/net/irext/decoder/service/IRDecodeService.java b/src/main/java/net/irext/decoder/service/IRDecodeService.java
index 2baf9a6..d98a29e 100644
--- a/src/main/java/net/irext/decoder/service/IRDecodeService.java
+++ b/src/main/java/net/irext/decoder/service/IRDecodeService.java
@@ -15,6 +15,8 @@ import net.irext.decoder.response.Status;
 import net.irext.decoder.service.base.AbstractBaseService;
 import net.irext.decodesdk.bean.ACStatus;
 import net.irext.decodesdk.utils.Constants;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,6 +34,8 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/irext")
 public class IRDecodeService extends AbstractBaseService {
 
+    Logger logger = LogManager.getLogger(IRDecodeService.class);
+
     private RemoteIndexMapper remoteIndexMapper;
 
     @Autowired
@@ -47,10 +51,12 @@ public class IRDecodeService extends AbstractBaseService {
     @PostMapping("/open")
     public ServiceResponse irOpen(@RequestBody OpenRequest openRequest) {
         try {
-            int indexId = openRequest.getIndexId();
+            int remoteIndexId = openRequest.getRemoteIndexId();
+
+            logger.trace("irOpen API called : " + remoteIndexId);
 
             ServiceResponse response = new ServiceResponse();
-            RemoteIndex remoteIndex = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(indexId);
+            RemoteIndex remoteIndex = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(remoteIndexId);
             if (null == remoteIndex) {
                 response.setStatus(new Status(Constants.ERROR_CODE_NETWORK_ERROR, ""));
                 return response;
diff --git a/src/main/resources/log4j2-spring.xml b/src/main/resources/log4j2-spring.xml
new file mode 100644
index 0000000..539824a
--- /dev/null
+++ b/src/main/resources/log4j2-spring.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout
+                    pattern="%style{%d{ISO8601}}{black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%C{1.}}{bright,yellow}: %msg%n%throwable" />
+        </Console>
+
+        <RollingFile name="RollingFile"
+                     fileName="./logs/spring-boot-logger-log4j2.log"
+                     filePattern="./logs/$${date:yyyy-MM}/spring-boot-logger-log4j2-%d{-dd-MMMM-yyyy}-%i.log.gz">
+            <PatternLayout>
+                <pattern>%d %p %C{1.} [%t] %m%n</pattern>
+            </PatternLayout>
+            <Policies>
+                <!-- rollover on startup, daily and when the file reaches
+                    10 MegaBytes -->
+                <OnStartupTriggeringPolicy />
+                <SizeBasedTriggeringPolicy
+                        size="10 MB" />
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+        </RollingFile>
+    </Appenders>
+
+    <Loggers>
+        <!-- LOG everything at INFO level -->
+        <Root level="info">
+            <AppenderRef ref="Console" />
+            <AppenderRef ref="RollingFile" />
+        </Root>
+
+        <!-- LOG "com.baeldung*" at TRACE level -->
+        <Logger name="net.irext" level="trace"></Logger>
+    </Loggers>
+
+</Configuration>
\ No newline at end of file