Skip to content

Commit

Permalink
Merge pull request instana#47 from instana/logging
Browse files Browse the repository at this point in the history
Add logging settings to prevent system pollution
  • Loading branch information
cedricziel authored Nov 16, 2020
2 parents 8cd5551 + 4c24345 commit e181d9b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
5 changes: 5 additions & 0 deletions docker-compose-load.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ services:
- robot-shop
depends_on:
- web
logging: &logging
driver: "json-file"
options:
max-size: "25m"
max-file: "2"
27 changes: 27 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,23 @@ services:
image: ${REPO}/rs-mongodb:${TAG}
networks:
- robot-shop
logging: &logging
driver: "json-file"
options:
max-size: "25m"
max-file: "2"
redis:
image: redis:4.0.6
networks:
- robot-shop
logging:
<<: *logging
rabbitmq:
image: rabbitmq:3.7-management-alpine
networks:
- robot-shop
logging:
<<: *logging
catalogue:
build:
context: catalogue
Expand All @@ -27,6 +36,8 @@ services:
interval: 1s
timeout: 10s
retries: 3
logging:
<<: *logging
user:
build:
context: user
Expand All @@ -41,6 +52,8 @@ services:
interval: 1s
timeout: 10s
retries: 3
logging:
<<: *logging
cart:
build:
context: cart
Expand All @@ -54,6 +67,8 @@ services:
interval: 1s
timeout: 10s
retries: 3
logging:
<<: *logging
mysql:
build:
context: mysql
Expand All @@ -62,6 +77,8 @@ services:
- NET_ADMIN
networks:
- robot-shop
logging:
<<: *logging
shipping:
build:
context: shipping
Expand All @@ -75,6 +92,8 @@ services:
interval: 1s
timeout: 10s
retries: 3
logging:
<<: *logging
ratings:
build:
context: ratings
Expand All @@ -90,6 +109,8 @@ services:
interval: 1s
timeout: 10s
retries: 3
logging:
<<: *logging
payment:
build:
context: payment
Expand All @@ -106,6 +127,8 @@ services:
# Uncomment to change payment gateway
#environment:
#PAYMENT_GATEWAY: "https://www.worldpay.com"
logging:
<<: *logging
dispatch:
build:
context: dispatch
Expand All @@ -114,6 +137,8 @@ services:
- rabbitmq
networks:
- robot-shop
logging:
<<: *logging
web:
build:
context: web
Expand All @@ -137,6 +162,8 @@ services:
# INSTANA_EUM_KEY: <your eum key>
# INSTANA_EUM_REPORTING_URL: https://eum-us-west-2.instana.io
# INSTANA_EUM_REPORTING_URL: https://eum-eu-west-1.instana.io
logging:
<<: *logging

networks:
robot-shop:
Expand Down

0 comments on commit e181d9b

Please sign in to comment.