Update docker-compose and log4j config to match what's deployed

parent 88cd8e4b
Pipeline #112642088 passed with stages
in 12 minutes and 45 seconds
......@@ -8,17 +8,18 @@ x-logging: &logging
services:
bot:
image: gdragon/throw-voice:${VERSION}
image: registry.gitlab.com/pawabot/pawa:${VERSION}
depends_on:
- datastore
env_file:
- ${ENV:-sample}.env
environment:
- TZ=America/Los_Angeles
- JAVA_TOOL_OPTIONS=-Dlog4j.configurationFile=log4j2-prod.xml -Xms1G -Xmx1536m
- JAVA_TOOL_OPTIONS=-Xmx1G -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/data/oom.bin
volumes:
- data:/app/data
restart: on-failure:5
- ./logs:/app/logs
restart: unless-stopped
logging:
<<: *logging
portainer:
......@@ -30,16 +31,19 @@ services:
logging:
<<: *logging
data:
image: metabase/metabase:v0.33.4
image: metabase/metabase:v0.34.1
environment:
- JAVA_TOOL_OPTIONS=-Xmx500m
- TZ=America/Los_Angeles
- MB_DB_FILE=/opt/data/metabase
ports:
- 3000:3000
volumes:
- data:/opt/data
logging:
<<: *logging
datastore:
image: minio/minio:RELEASE.2019-10-12T01-39-57Z
image: minio/minio:RELEASE.2020-01-25T02-50-51Z
command: -c "MINIO_SECRET_KEY=$$DS_SECRET_KEY MINIO_ACCESS_KEY=$$DS_ACCESS_KEY minio gateway b2"
entrypoint: sh
env_file:
......
......@@ -9,7 +9,10 @@
</Properties>
<Appenders>
<Console name="Console">
<PatternLayout pattern="${globalPattern}" charset="UTF-8"/>
<PatternLayout pattern="${globalPattern}" charset="UTF-8" />
<Filters>
<RegexFilter regex=".*Transaction attempt.*" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
</Console>
<Rollbar name="Rollbar">
<accessToken>${env:ROLLBAR_TOKEN}</accessToken>
......@@ -21,6 +24,8 @@
<RegexFilter regex=".*There was some unexpected exception in the combinedAudioExecutor.*" onMatch="DENY"
onMismatch="NEUTRAL"/>
<RegexFilter regex=".*There was some random exception.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*Failed to run transaction.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*One of the EventListeners had an uncaught exception.*" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
</Rollbar>
<Discord name="Discord">
......@@ -32,6 +37,7 @@
onMismatch="NEUTRAL"/>
<RegexFilter regex=".*There was some random exception.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*Transaction attempt.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*One of the EventListeners had an uncaught exception.*" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
</Discord>
<RollingRandomAccessFile
......@@ -51,10 +57,10 @@
<AppenderRef level="error" ref="Discord"/>
<AppenderRef ref="Console"/>
</Root>
<Logger name="tech.gdragon.db.ThreadLocalTransactionManager" level="debug" additivity="false">
<Logger name="tech.gdragon.db.ThreadLocalTransactionManager" level="info" additivity="false">
<AppenderRef ref="RollingRandomAccessFile"/>
</Logger>
<Logger name="Exposed" level="debug" additivity="false">
<Logger name="Exposed" level="info" additivity="false">
<AppenderRef ref="RollingRandomAccessFile"/>
</Logger>
</Loggers>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment