From 7073b8c88e0d3da0272e043bbdcddfc2a6a9717b Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Sun, 12 Oct 2025 21:54:48 -0700 Subject: [PATCH 1/2] fix: use logs/ --- 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 ++-- .../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 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/access-control-service/src/main/resources/logback.xml b/access-control-service/src/main/resources/logback.xml index 4763107b503..6a5e4871b4c 100644 --- a/access-control-service/src/main/resources/logback.xml +++ b/access-control-service/src/main/resources/logback.xml @@ -29,10 +29,10 @@ - ../log/access-control-service.log + logs/access-control-service.log true - ../log/access-control-service-%d{yyyy-MM-dd}.log.gz + logs/access-control-service-%d{yyyy-MM-dd}.log.gz [%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n diff --git a/amber/src/main/resources/computing-unit-master-config.yml b/amber/src/main/resources/computing-unit-master-config.yml index a036e424efe..88253f78126 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 4faa49cd579..aff1ee485ec 100644 --- a/amber/src/main/resources/logback.xml +++ b/amber/src/main/resources/logback.xml @@ -30,10 +30,10 @@ - ../log/amber-worker.log + logs/amber-worker.log true - ../log/amber-worker-%d{yyyy-MM-dd}.log.gz + logs/amber-worker-%d{yyyy-MM-dd}.log.gz [%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n 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 5a5cb886e59..94a00fc4537 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 60519dc0b3a..c777cecd856 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 4d372fa847f..62daee86796 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} From c9749840d2b0ed44317bafeb369d42252fdd3b4c Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Sun, 12 Oct 2025 21:55:26 -0700 Subject: [PATCH 2/2] chore: ignore logs/ --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 627c56f0874..62f85f0e2f0 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