Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into docs/openapi-create-app
Browse files Browse the repository at this point in the history
Anilople authored Dec 11, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 9c94bbf + ee1517b commit 32d33b8
Showing 5 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/
# console appender file name
LOG_FILENAME=console.log
# console appender log file name
LOG_FILENAME=apollo-adminservice.console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003171/
LOG_FOLDER=/opt/logs/
# console appender log file name
LOG_FILENAME=console.log
LOG_FILENAME=apollo-configservice.console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE
1 change: 1 addition & 0 deletions apollo-portal/src/assembly/assembly-descriptor.xml
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@
<includes>
<include>application-github.properties</include>
<include>apollo-env.properties</include>
<include>application.properties</include>
</includes>
</fileSet>
<!--artifact -->
4 changes: 2 additions & 2 deletions apollo-portal/src/main/resources/apollo-portal.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003173/
LOG_FOLDER=/opt/logs/
# console appender log file name
LOG_FILENAME=console.log
LOG_FILENAME=apollo-portal.console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@
</developers>

<properties>
<revision>2.2.0-SNAPSHOT</revision>
<revision>2.2.0</revision>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<apollo-java.version>2.2.0</apollo-java.version>

0 comments on commit 32d33b8

Please sign in to comment.