This is an automated email from the ASF dual-hosted git repository.
yiconghuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 6e867841a5 fix: use `logs/` for all services (#3887)
6e867841a5 is described below
commit 6e867841a575610401b71d2462a222281dcb2076
Author: Yicong Huang <[email protected]>
AuthorDate: Mon Oct 13 00:26:41 2025 -0700
fix: use `logs/` for all services (#3887)
We have been using a mixed of `logs/`, `../log/` and `log/` to store
logs. This PR unifies them to use `logs/` directory.
follows up on #3879
---
.gitignore | 2 +-
access-control-service/src/main/resources/logback.xml | 4 ++--
amber/src/main/resources/computing-unit-master-config.yml | 2 +-
amber/src/main/resources/logback.xml | 4 ++--
amber/src/main/resources/texera-compiling-service-web-config.yml | 6 +++---
amber/src/main/resources/web-config.yml | 6 +++---
common/config/src/main/resources/application.conf | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index 627c56f087..62f85f0e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,7 +87,7 @@ rebel.xml
*.log.gz
# Ignoring the entire log folder
-log/
+logs/
# Ignoring package-lock.json
package-lock.json
diff --git a/access-control-service/src/main/resources/logback.xml
b/access-control-service/src/main/resources/logback.xml
index 4763107b50..6a5e4871b4 100644
--- a/access-control-service/src/main/resources/logback.xml
+++ b/access-control-service/src/main/resources/logback.xml
@@ -29,10 +29,10 @@
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>../log/access-control-service.log</file>
+ <file>logs/access-control-service.log</file>
<immediateFlush>true</immediateFlush>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>../log/access-control-service-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+
<fileNamePattern>logs/access-control-service-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>[%date{ISO8601}] [%level] [%logger] [%thread] - %msg
%n</pattern>
diff --git a/amber/src/main/resources/computing-unit-master-config.yml
b/amber/src/main/resources/computing-unit-master-config.yml
index a036e424ef..88253f7812 100644
--- a/amber/src/main/resources/computing-unit-master-config.yml
+++ b/amber/src/main/resources/computing-unit-master-config.yml
@@ -40,7 +40,7 @@ logging:
- type: console
logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
- type: file
- currentLogFilename: ../log/computing-unit-master.log
+ currentLogFilename: logs/computing-unit-master.log
threshold: ALL
queueSize: 512
discardingThreshold: 0
diff --git a/amber/src/main/resources/logback.xml
b/amber/src/main/resources/logback.xml
index 4faa49cd57..aff1ee485e 100644
--- a/amber/src/main/resources/logback.xml
+++ b/amber/src/main/resources/logback.xml
@@ -30,10 +30,10 @@
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>../log/amber-worker.log</file>
+ <file>logs/amber-worker.log</file>
<immediateFlush>true</immediateFlush>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>../log/amber-worker-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+
<fileNamePattern>logs/amber-worker-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>[%date{ISO8601}] [%level] [%logger] [%thread] - %msg
%n</pattern>
diff --git a/amber/src/main/resources/texera-compiling-service-web-config.yml
b/amber/src/main/resources/texera-compiling-service-web-config.yml
index 5a5cb886e5..94a00fc453 100644
--- a/amber/src/main/resources/texera-compiling-service-web-config.yml
+++ b/amber/src/main/resources/texera-compiling-service-web-config.yml
@@ -31,12 +31,12 @@ server:
appenders:
- type: console
- type: file
- currentLogFilename: ../log/access.log
+ currentLogFilename: logs/access.log
threshold: ALL
queueSize: 512
discardingThreshold: 0
archive: true
- archivedLogFilenamePattern: ../log/access-%d{yyyy-MM-dd}.log.gz
+ archivedLogFilenamePattern: logs/access-%d{yyyy-MM-dd}.log.gz
archivedFileCount: 7
bufferSize: 8KiB
immediateFlush: true
@@ -48,7 +48,7 @@ logging:
- type: console
logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
- type: file
- currentLogFilename: ../log/texera-workflow-compiling-service.log
+ currentLogFilename: logs/texera-workflow-compiling-service.log
threshold: ALL
queueSize: 512
discardingThreshold: 0
diff --git a/amber/src/main/resources/web-config.yml
b/amber/src/main/resources/web-config.yml
index 60519dc0b3..c777cecd85 100644
--- a/amber/src/main/resources/web-config.yml
+++ b/amber/src/main/resources/web-config.yml
@@ -31,12 +31,12 @@ server:
appenders:
- type: console
- type: file
- currentLogFilename: ../log/access.log
+ currentLogFilename: logs/access.log
threshold: ALL
queueSize: 512
discardingThreshold: 0
archive: true
- archivedLogFilenamePattern: ../log/access-%d{yyyy-MM-dd}.log.gz
+ archivedLogFilenamePattern: logs/access-%d{yyyy-MM-dd}.log.gz
archivedFileCount: 7
bufferSize: 8KiB
immediateFlush: true
@@ -48,7 +48,7 @@ logging:
- type: console
logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
- type: file
- currentLogFilename: ../log/amber-server.log
+ currentLogFilename: logs/amber-server.log
threshold: ALL
queueSize: 512
discardingThreshold: 0
diff --git a/common/config/src/main/resources/application.conf
b/common/config/src/main/resources/application.conf
index 4d372fa847..62daee8679 100644
--- a/common/config/src/main/resources/application.conf
+++ b/common/config/src/main/resources/application.conf
@@ -94,7 +94,7 @@ web-server {
fault-tolerance {
# URI for storage, empty to disable logging.
# Use absolute path only. for local file system, $AMBER_FOLDER will be
interpolated to Amber folder path.
- # e.g. use "file://$AMBER_FOLDER/../log/recovery-logs/" for local logging.
+ # e.g. use "file://$AMBER_FOLDER/logs/recovery-logs/" for local logging.
log-storage-uri = ""
log-storage-uri = ${?FAULT_TOLERANCE_LOG_STORAGE_URI}
