Skip to content

Commit c986253

Browse files
dgzpgdgzpg
authored
Merge pull request #67 from dgzpg/feat-addDynamicallyAdjustLogLevel
Feat add common configuration
2 parents d171bc9 + 14397a5 commit c986253

File tree

24 files changed

+233
-187
lines changed

24 files changed

+233
-187
lines changed

‎examples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<name>capa-sdk-examples</name>
3232

3333
<properties>
34-
<log4j.version>2.8.2</log4j.version>
34+
<log4j.version>2.14.1</log4j.version>
3535
<logback.version>1.1.7</logback.version>
3636
<slf4j-api.version>1.7.32</slf4j-api.version>
3737
</properties>
@@ -67,7 +67,7 @@
6767
<version>${log4j.version}</version>
6868
</dependency>
6969
<!-- logback -->
70-
<!-- <dependency>
70+
<!--<dependency>
7171
<groupId>ch.qos.logback</groupId>
7272
<artifactId>logback-classic</artifactId>
7373
<version>${logback.version}</version>

examples/src/main/java/group/rxcloud/capa/examples/telemetry/DemoLog.java renamed to examples/src/main/java/group/rxcloud/capa/examples/log/DemoLog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package group.rxcloud.capa.examples.telemetry;
17+
package group.rxcloud.capa.examples.log;
1818

1919
import lombok.extern.slf4j.Slf4j;
2020

‎examples/src/main/resources/xml/logback.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,9 @@
1717
-->
1818
<configuration>
1919
<!--Log-->
20-
<appender name="Log" class="group.rxcloud.capa.component.log.agent.CapaLogbackAppenderAgent">
20+
<appender name="Log" class="group.rxcloud.capa.component.log.CapaLogbackAppenderAgent">
2121
</appender>
2222

23-
<logger name="com.ctrip.ibu.market.e2c" level="INFO" additivity="false">
24-
<!-- <appender-ref ref="STDOUT"/>-->
25-
<appender-ref ref="Log"/>
26-
</logger>
27-
28-
<logger name="com.ctrip.ibu.telescope.mock.support" level="INFO" additivity="false">
29-
<!-- <appender-ref ref="STDOUT"/>-->
30-
<appender-ref ref="Log"/>
31-
</logger>
32-
3323
<root level="INFO">
3424
<appender-ref ref="Log"/>
3525
</root>

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<name>reckless11</name>
4545
<email>[email protected]</email>
4646
</developer>
47+
<developer>
48+
<name>dgzpg</name>
49+
<email>[email protected]</email>
50+
</developer>
4751
</developers>
4852

4953
<scm>

‎sdk-component/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<properties>
3434
<okhttp.version>4.9.1</okhttp.version>
3535
<kotlin-stdlib.version>1.4.10</kotlin-stdlib.version>
36-
<log4j.version>2.8.2</log4j.version>
36+
<log4j.version>2.14.1</log4j.version>
3737
<logback.version>1.1.7</logback.version>
3838
<guava-version>19.0</guava-version>
3939
<commons-lang3-version>3.11</commons-lang3-version>

sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgent.java renamed to sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgent.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package group.rxcloud.capa.component.log.agent;
17+
package group.rxcloud.capa.component.log;
1818

19-
import group.rxcloud.capa.component.log.enums.CapaLogLevel;
20-
import group.rxcloud.capa.component.log.manager.LogManager;
2119
import group.rxcloud.capa.infrastructure.CapaClassLoader;
2220
import org.apache.logging.log4j.core.Appender;
2321
import org.apache.logging.log4j.core.Filter;
@@ -30,7 +28,6 @@
3028
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
3129

3230
import java.io.Serializable;
33-
import java.util.Optional;
3431

3532
/**
3633
* The abstract log4j appender. Extend this and provide your specific impl.
@@ -66,7 +63,7 @@ public CapaLog4jAppenderAgent(String name,
6663
Filter filter,
6764
Layout<? extends Serializable> layout,
6865
boolean ignoreExceptions) {
69-
super(name, filter, layout, ignoreExceptions);
66+
super(name, filter, layout, ignoreExceptions, null);
7067
}
7168

7269
/**
@@ -100,12 +97,7 @@ public static CapaLog4jAppender buildCapaLog4jAppender() {
10097

10198
@Override
10299
public void append(LogEvent event) {
103-
if (event != null && event.getLevel() != null) {
104-
Optional<CapaLogLevel> capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().name());
105-
if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) {
106-
logAppender.appendLog(event);
107-
}
108-
}
100+
logAppender.append(event);
109101
}
110102

111103
/**
@@ -118,6 +110,6 @@ public interface CapaLog4jAppender {
118110
*
119111
* @param event The log event.
120112
*/
121-
void appendLog(LogEvent event);
113+
void append(LogEvent event);
122114
}
123115
}

sdk-component/src/main/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgent.java renamed to sdk-component/src/main/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgent.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package group.rxcloud.capa.component.log.agent;
17+
package group.rxcloud.capa.component.log;
1818

1919
import ch.qos.logback.classic.spi.ILoggingEvent;
2020
import ch.qos.logback.core.UnsynchronizedAppenderBase;
21-
import group.rxcloud.capa.component.log.enums.CapaLogLevel;
22-
import group.rxcloud.capa.component.log.manager.LogManager;
2321
import group.rxcloud.capa.infrastructure.CapaClassLoader;
2422

25-
import java.util.Optional;
26-
2723
/**
2824
* The agent of the logback impl.
2925
*/
@@ -64,12 +60,7 @@ public static CapaLogbackAppender buildCapaLogbackAppender() {
6460
*/
6561
@Override
6662
protected void append(ILoggingEvent event) {
67-
if (event != null && event.getLevel() != null) {
68-
Optional<CapaLogLevel> capaLogLevel = CapaLogLevel.toCapaLogLevel(event.getLevel().levelStr);
69-
if (capaLogLevel.isPresent() && LogManager.whetherLogsCanBeOutput(capaLogLevel.get())) {
70-
logbackAppender.appendLog(event);
71-
}
72-
}
63+
logbackAppender.append(event);
7364
}
7465

7566
/**
@@ -82,6 +73,7 @@ public interface CapaLogbackAppender {
8273
*
8374
* @param event The log event.
8475
*/
85-
void appendLog(ILoggingEvent event);
76+
void append(ILoggingEvent event);
8677
}
8778
}
79+

‎sdk-component/src/main/java/group/rxcloud/capa/component/log/configuration/LogSwitchConfiguration.java‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLog4jAppenderAgentTest.java renamed to sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLog4jAppenderAgentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package group.rxcloud.capa.component.log.agent;
17+
package group.rxcloud.capa.component.log;
1818

1919
import org.apache.logging.log4j.core.Filter;
2020
import org.apache.logging.log4j.core.Layout;

sdk-component/src/test/java/group/rxcloud/capa/component/log/agent/CapaLogbackAppenderAgentTest.java renamed to sdk-component/src/test/java/group/rxcloud/capa/component/log/CapaLogbackAppenderAgentTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package group.rxcloud.capa.component.log.agent;
17+
package group.rxcloud.capa.component.log;
1818

1919
import ch.qos.logback.classic.spi.ILoggingEvent;
2020
import org.junit.jupiter.api.Assertions;
@@ -34,6 +34,6 @@ void testAppend() {
3434
CapaLogbackAppenderAgent.CapaLogbackAppender capaLogbackAppender = CapaLogbackAppenderAgent.buildCapaLogbackAppender();
3535
ILoggingEvent logEvent = Mockito.mock(ILoggingEvent.class);
3636
Mockito.when(logEvent.getFormattedMessage()).thenReturn("TEST");
37-
capaLogbackAppender.appendLog(logEvent);
37+
capaLogbackAppender.append(logEvent);
3838
}
3939
}

0 commit comments

Comments
 (0)