Skip to content

Commit f8b4af3

Browse files
stevehustevehu
authored
fixes #2113 split the ServerInfoConfig to a info-config module (#2114)
1 parent 5527805 commit f8b4af3

File tree

8 files changed

+130
-1
lines changed

8 files changed

+130
-1
lines changed

‎health-config/src/main/resources/config/health.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ useJson: ${health.useJson:false}
1212
timeout: ${health.timeout:2000}
1313

1414
# For some of the services like light-proxy, http-sidecar and kafka-sidecar, we might need to check the down
15-
# stream API before return the health status to the invoker. By default it is not enabled.
15+
# stream API before return the health status to the invoker. By default, it is not enabled.
1616

1717
# if the health check needs to invoke down streams API. It is false by default.
1818
downstreamEnabled: ${health.downstreamEnabled:false}

‎info-config/pom.xml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<!--
2+
~ Copyright (c) 2016 Network New Technologies Inc.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
21+
<parent>
22+
<groupId>com.networknt</groupId>
23+
<artifactId>light-4j</artifactId>
24+
<version>2.1.32-SNAPSHOT</version>
25+
<relativePath>../pom.xml</relativePath>
26+
</parent>
27+
28+
<artifactId>info-config</artifactId>
29+
<packaging>jar</packaging>
30+
<description>A server info configuration module shared with light-aws-lambda</description>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>com.networknt</groupId>
35+
<artifactId>config</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.networknt</groupId>
39+
<artifactId>utility</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.slf4j</groupId>
43+
<artifactId>slf4j-api</artifactId>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>ch.qos.logback</groupId>
48+
<artifactId>logback-classic</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>junit</groupId>
53+
<artifactId>junit</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
</dependencies>
57+
58+
</project>

‎info/src/main/java/com/networknt/info/ServerInfoConfig.java renamed to ‎info-config/src/main/java/com/networknt/info/ServerInfoConfig.java

File renamed without changes.

‎info-config/src/main/java/module-info.j

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module com.networknt.info {
2+
exports com.networknt.info;
3+
4+
requires com.networknt.config;
5+
requires com.networknt.handler;
6+
requires com.networknt.security;
7+
requires com.networknt.status;
8+
requires com.networknt.utility;
9+
10+
requires undertow.core;
11+
requires org.slf4j;
12+
}

‎info/src/main/resources/config/info.yml renamed to ‎info-config/src/main/resources/config/info.yml

File renamed without changes.

‎info-config/src/test/resources/logback-test.xml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (c) 2016 Network New Technologies Inc.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<configuration>
19+
<turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
20+
<Marker>PROFILER</Marker>
21+
<!--<OnMatch>DENY</OnMatch>-->
22+
<OnMatch>NEUTRAL</OnMatch>
23+
</turboFilter>
24+
25+
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
26+
<!-- encoders are assigned the type
27+
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
28+
<encoder>
29+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5marker %-5level %logger{36} - %msg%n</pattern>
30+
</encoder>
31+
</appender>
32+
33+
<appender name="log" class="ch.qos.logback.core.FileAppender">
34+
<File>target/test.log</File>
35+
<Append>false</Append>
36+
<layout class="ch.qos.logback.classic.PatternLayout">
37+
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %class{36}:%L %M - %msg%n</Pattern>
38+
</layout>
39+
</appender>
40+
41+
<root level="trace">
42+
<appender-ref ref="stdout"/>
43+
</root>
44+
45+
<logger name="com.networknt" level="trace">
46+
<appender-ref ref="log"/>
47+
</logger>
48+
49+
</configuration>

‎info/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<groupId>com.networknt</groupId>
5151
<artifactId>handler</artifactId>
5252
</dependency>
53+
<dependency>
54+
<groupId>com.networknt</groupId>
55+
<artifactId>info-config</artifactId>
56+
</dependency>
5357
<dependency>
5458
<groupId>io.undertow</groupId>
5559
<artifactId>undertow-core</artifactId>

‎pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<module>audit</module>
129129
<module>audit-config</module>
130130
<module>dump</module>
131+
<module>info-config</module>
131132
<module>info</module>
132133
<module>health-config</module>
133134
<module>health</module>
@@ -247,6 +248,11 @@
247248
<artifactId>dump</artifactId>
248249
<version>${project.version}</version>
249250
</dependency>
251+
<dependency>
252+
<groupId>com.networknt</groupId>
253+
<artifactId>info-config</artifactId>
254+
<version>${project.version}</version>
255+
</dependency>
250256
<dependency>
251257
<groupId>com.networknt</groupId>
252258
<artifactId>info</artifactId>

0 commit comments

Comments
 (0)