dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12872 from dashevchenko/edqs-to-tb-edqs

Browse Source 
Renamed edqs service to tb-edqs
This commit is contained in:
Viacheslav Klimov 2025-03-11 15:09:15 +02:00 committed by GitHub
commit 533c8c8de4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-compose.edqs.volumes.yml
View File

@ -19,10 +19,10 @@ version: '3.0'
services: services:
tb-edqs-1: tb-edqs-1:
volumes: volumes:
- tb-edqs-log-volume:/var/log/edqs - tb-edqs-log-volume:/var/log/tb-edqs
tb-edqs-2: tb-edqs-2:
volumes: volumes:
- tb-edqs-log-volume:/var/log/edqs - tb-edqs-log-volume:/var/log/tb-edqs
volumes: volumes:
tb-edqs-log-volume: tb-edqs-log-volume:

12
docker/docker-compose.edqs.yml
View File

@ -33,10 +33,10 @@ services:
restart: always restart: always
image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}" image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
env_file: env_file:
- edqs.env - tb-edqs.env
volumes: volumes:
- ./edqs/conf:/usr/share/edqs/conf - ./tb-edqs/conf:/usr/share/tb-edqs/conf
- ./edqs/log:/var/log/edqs - ./tb-edqs/log:/var/log/tb-edqs
ports: ports:
- "8080" - "8080"
depends_on: depends_on:
@ -46,10 +46,10 @@ services:
restart: always restart: always
image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}" image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
env_file: env_file:
- edqs.env - tb-edqs.env
volumes: volumes:
- ./edqs/conf:/usr/share/edqs/conf - ./tb-edqs/conf:/usr/share/tb-edqs/conf
- ./edqs/log:/var/log/edqs - ./tb-edqs/log:/var/log/tb-edqs
ports: ports:
- "8080" - "8080"
depends_on: depends_on:

0
docker/edqs.env → docker/tb-edqs.env
View File

4
docker/edqs/conf/logback.xml → docker/tb-edqs/conf/logback.xml
View File

@ -21,10 +21,10 @@
<appender name="fileLogAppender" <appender name="fileLogAppender"
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/var/log/edqs/${TB_SERVICE_ID}/tb-edqs.log</file> <file>/var/log/tb-edqs/${TB_SERVICE_ID}/tb-edqs.log</file>
<rollingPolicy <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>/var/log/edqs/tb-edqs.%d{yyyy-MM-dd}.%i.log</fileNamePattern> <fileNamePattern>/var/log/tb-edqs/tb-edqs.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
<maxHistory>30</maxHistory> <maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap> <totalSizeCap>3GB</totalSizeCap>

4
docker/edqs/conf/edqs.conf → docker/tb-edqs/conf/tb-edqs.conf
View File

@ -14,9 +14,9 @@
# limitations under the License. # limitations under the License.
# #
export JAVA_OPTS="$JAVA_OPTS -Xlog:gc*,heap*,age*,safepoint=debug:file=/var/log/edqs/${TB_SERVICE_ID}-gc.log:time,uptime,level,tags:filecount=10,filesize=10M" export JAVA_OPTS="$JAVA_OPTS -Xlog:gc*,heap*,age*,safepoint=debug:file=/var/log/tb-edqs/${TB_SERVICE_ID}-gc.log:time,uptime,level,tags:filecount=10,filesize=10M"
export JAVA_OPTS="$JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError" export JAVA_OPTS="$JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError"
export JAVA_OPTS="$JAVA_OPTS -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark" export JAVA_OPTS="$JAVA_OPTS -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
export JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC -XX:MaxGCPauseMillis=500 -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:MaxTenuringThreshold=10" export JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC -XX:MaxGCPauseMillis=500 -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:MaxTenuringThreshold=10"
export LOG_FILENAME=tb-edqs.out export LOG_FILENAME=tb-edqs.out
export LOADER_PATH=/usr/share/edqs/conf export LOADER_PATH=/usr/share/tb-edqs/conf