From 9cd6bbf50bb7047ecfe7fd938ddfb2e40614ae1a Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 24 Mar 2022 07:20:34 +0000 Subject: [PATCH 1/5] added logging --- app/views/install/compose.phtml | 90 +++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 5740c8680d..0780e51289 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -36,6 +36,11 @@ services: appwrite: image: /: container_name: appwrite + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -132,6 +137,11 @@ services: image: /: entrypoint: realtime container_name: appwrite-realtime + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped labels: - "traefik.enable=true" @@ -172,6 +182,11 @@ services: appwrite-worker-audits: image: /: entrypoint: worker-audits + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-audits restart: unless-stopped networks: @@ -197,6 +212,11 @@ services: appwrite-worker-webhooks: image: /: entrypoint: worker-webhooks + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-webhooks restart: unless-stopped networks: @@ -218,6 +238,11 @@ services: appwrite-worker-deletes: image: /: entrypoint: worker-deletes + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-deletes restart: unless-stopped networks: @@ -259,6 +284,11 @@ services: appwrite-worker-database: image: /: entrypoint: worker-database + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-database restart: unless-stopped networks: @@ -284,6 +314,11 @@ services: appwrite-worker-builds: image: /: entrypoint: worker-builds + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-builds restart: unless-stopped networks: @@ -310,6 +345,11 @@ services: appwrite-worker-certificates: image: /: entrypoint: worker-certificates + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-certificates restart: unless-stopped networks: @@ -340,6 +380,11 @@ services: appwrite-worker-functions: image: /: entrypoint: worker-functions + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-functions restart: unless-stopped networks: @@ -369,6 +414,11 @@ services: appwrite-executor: image: /: entrypoint: executor + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-executor restart: unless-stopped stop_signal: SIGINT @@ -414,6 +464,11 @@ services: appwrite-worker-mails: image: /: entrypoint: worker-mails + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-worker-mails restart: unless-stopped networks: @@ -440,6 +495,11 @@ services: appwrite-maintenance: image: /: entrypoint: maintenance + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m container_name: appwrite-maintenance restart: unless-stopped networks: @@ -462,6 +522,11 @@ services: image: /: entrypoint: usage container_name: appwrite-usage + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -488,6 +553,11 @@ services: image: /: entrypoint: schedule container_name: appwrite-schedule + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -503,6 +573,11 @@ services: mariadb: image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite-mariadb + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -518,6 +593,11 @@ services: redis: image: redis:6.2-alpine container_name: appwrite-redis + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -536,6 +616,11 @@ services: influxdb: image: appwrite/influxdb:1.5.0 container_name: appwrite-influxdb + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite @@ -545,6 +630,11 @@ services: telegraf: image: appwrite/telegraf:1.4.0 container_name: appwrite-telegraf + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m restart: unless-stopped networks: - appwrite From dd29f6b28806693ad20bc730c3b1f1cb979a4a96 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 24 Mar 2022 07:29:59 +0000 Subject: [PATCH 2/5] seems this variable was missing in production compose and .env --- .env | 1 + app/views/install/compose.phtml | 1 + 2 files changed, 2 insertions(+) diff --git a/.env b/.env index a6bea88b02..c205935b79 100644 --- a/.env +++ b/.env @@ -45,6 +45,7 @@ _APP_SMTP_SECURE= _APP_SMTP_USERNAME= _APP_SMTP_PASSWORD= _APP_STORAGE_LIMIT=30000000 +_APP_STORAGE_PREVIEW_LIMIT=20000000 _APP_FUNCTIONS_SIZE_LIMIT=30000000 _APP_FUNCTIONS_TIMEOUT=900 _APP_FUNCTIONS_BUILD_TIMEOUT=900 diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 0780e51289..bdc961f540 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -103,6 +103,7 @@ services: - _APP_INFLUXDB_HOST - _APP_INFLUXDB_PORT - _APP_STORAGE_LIMIT + - _APP_STORAGE_PREVIEW_LIMIT - _APP_STORAGE_ANTIVIRUS - _APP_STORAGE_ANTIVIRUS_HOST - _APP_STORAGE_ANTIVIRUS_PORT From 586c3af5dfd90070ca51af196d67cfbf2037b795 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 29 Mar 2022 09:48:49 +0000 Subject: [PATCH 3/5] logging limit update --- app/views/install/compose.phtml | 115 +++++++------------------------- 1 file changed, 25 insertions(+), 90 deletions(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index bdc961f540..f25cfdc35f 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -1,3 +1,10 @@ +x-logging: &x-logging + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m + getParam('httpPort', ''); @@ -36,11 +43,7 @@ services: appwrite: image: /: container_name: appwrite - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -138,11 +141,7 @@ services: image: /: entrypoint: realtime container_name: appwrite-realtime - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped labels: - "traefik.enable=true" @@ -183,11 +182,7 @@ services: appwrite-worker-audits: image: /: entrypoint: worker-audits - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-audits restart: unless-stopped networks: @@ -213,11 +208,7 @@ services: appwrite-worker-webhooks: image: /: entrypoint: worker-webhooks - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-webhooks restart: unless-stopped networks: @@ -239,11 +230,7 @@ services: appwrite-worker-deletes: image: /: entrypoint: worker-deletes - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-deletes restart: unless-stopped networks: @@ -285,11 +272,7 @@ services: appwrite-worker-database: image: /: entrypoint: worker-database - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-database restart: unless-stopped networks: @@ -315,11 +298,7 @@ services: appwrite-worker-builds: image: /: entrypoint: worker-builds - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-builds restart: unless-stopped networks: @@ -346,11 +325,7 @@ services: appwrite-worker-certificates: image: /: entrypoint: worker-certificates - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-certificates restart: unless-stopped networks: @@ -381,11 +356,7 @@ services: appwrite-worker-functions: image: /: entrypoint: worker-functions - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-functions restart: unless-stopped networks: @@ -415,11 +386,7 @@ services: appwrite-executor: image: /: entrypoint: executor - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-executor restart: unless-stopped stop_signal: SIGINT @@ -465,11 +432,7 @@ services: appwrite-worker-mails: image: /: entrypoint: worker-mails - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-worker-mails restart: unless-stopped networks: @@ -496,11 +459,7 @@ services: appwrite-maintenance: image: /: entrypoint: maintenance - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging container_name: appwrite-maintenance restart: unless-stopped networks: @@ -523,11 +482,7 @@ services: image: /: entrypoint: usage container_name: appwrite-usage - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -554,11 +509,7 @@ services: image: /: entrypoint: schedule container_name: appwrite-schedule - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -574,11 +525,7 @@ services: mariadb: image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite-mariadb - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -594,11 +541,7 @@ services: redis: image: redis:6.2-alpine container_name: appwrite-redis - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -617,11 +560,7 @@ services: influxdb: image: appwrite/influxdb:1.5.0 container_name: appwrite-influxdb - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite @@ -631,11 +570,7 @@ services: telegraf: image: appwrite/telegraf:1.4.0 container_name: appwrite-telegraf - logging: - driver: 'json-file' - options: - max-file: 5 - max-size: 10m + <<: *x-logging restart: unless-stopped networks: - appwrite From a1cc57fbc7232104e27b4cd0bfb4fa42b81d7043 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 29 Mar 2022 09:50:57 +0000 Subject: [PATCH 4/5] log limit on development stack --- docker-compose.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2ddd5dd51b..3521b64bac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,9 @@ +x-logging: &x-logging + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m # WARNING! # This is a development version of THE Appwrite docker-compose.yml file. # Avoid using this file in your production environment. @@ -8,6 +14,7 @@ version: '3' services: traefik: image: traefik:2.5 + <<: *x-logging container_name: appwrite-traefik command: - --log.level=DEBUG @@ -37,6 +44,7 @@ services: appwrite: container_name: appwrite + <<: *x-logging build: context: . args: @@ -152,6 +160,7 @@ services: appwrite-realtime: entrypoint: realtime + <<: *x-logging container_name: appwrite-realtime build: context: . @@ -200,6 +209,7 @@ services: appwrite-worker-audits: entrypoint: worker-audits + <<: *x-logging container_name: appwrite-worker-audits build: context: . @@ -228,6 +238,7 @@ services: appwrite-worker-webhooks: entrypoint: worker-webhooks + <<: *x-logging container_name: appwrite-worker-webhooks build: context: . @@ -253,6 +264,7 @@ services: appwrite-worker-deletes: entrypoint: worker-deletes + <<: *x-logging container_name: appwrite-worker-deletes build: context: . @@ -296,6 +308,7 @@ services: appwrite-worker-database: entrypoint: worker-database + <<: *x-logging container_name: appwrite-worker-database build: context: . @@ -325,6 +338,7 @@ services: appwrite-worker-builds: entrypoint: worker-builds + <<: *x-logging container_name: appwrite-worker-builds build: context: . @@ -354,6 +368,7 @@ services: appwrite-worker-certificates: entrypoint: worker-certificates + <<: *x-logging container_name: appwrite-worker-certificates build: context: . @@ -386,6 +401,7 @@ services: appwrite-worker-functions: entrypoint: worker-functions + <<: *x-logging container_name: appwrite-worker-functions build: context: . @@ -418,6 +434,7 @@ services: appwrite-executor: container_name: appwrite-executor + <<: *x-logging entrypoint: executor stop_signal: SIGINT build: @@ -471,6 +488,7 @@ services: appwrite-worker-mails: entrypoint: worker-mails + <<: *x-logging container_name: appwrite-worker-mails build: context: . @@ -502,6 +520,7 @@ services: appwrite-maintenance: entrypoint: maintenance + <<: *x-logging container_name: appwrite-maintenance build: context: . @@ -526,6 +545,7 @@ services: appwrite-usage: entrypoint: usage + <<: *x-logging container_name: appwrite-usage build: context: . @@ -558,6 +578,7 @@ services: appwrite-schedule: entrypoint: schedule + <<: *x-logging container_name: appwrite-schedule build: context: . @@ -578,6 +599,7 @@ services: mariadb: image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite-mariadb + <<: *x-logging networks: - appwrite volumes: @@ -606,6 +628,7 @@ services: redis: image: redis:6.2-alpine + <<: *x-logging container_name: appwrite-redis ports: - "6379:6379" @@ -625,6 +648,7 @@ services: influxdb: image: appwrite/influxdb:1.5.0 container_name: appwrite-influxdb + <<: *x-logging networks: - appwrite volumes: @@ -633,6 +657,7 @@ services: telegraf: image: appwrite/telegraf:1.4.0 container_name: appwrite-telegraf + <<: *x-logging networks: - appwrite environment: @@ -655,6 +680,7 @@ services: maildev: # used mainly for dev tests image: appwrite/mailcatcher:1.0.0 container_name: appwrite-mailcatcher + <<: *x-logging ports: - '9503:1080' networks: @@ -663,6 +689,7 @@ services: request-catcher: # used mainly for dev tests image: appwrite/requestcatcher:1.0.0 container_name: appwrite-requestcatcher + <<: *x-logging ports: - '9504:5000' networks: @@ -671,6 +698,7 @@ services: adminer: image: adminer container_name: appwrite-adminer + <<: *x-logging restart: always ports: - 9506:8080 From 2ef2fa2d5fe9fb02e5b33cb422e50541e65777eb Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 10 Apr 2022 12:57:00 +0545 Subject: [PATCH 5/5] warning to top --- docker-compose.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3521b64bac..c63b9c80e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,14 @@ +# WARNING! +# This is a development version of THE Appwrite docker-compose.yml file. +# Avoid using this file in your production environment. +# We're exposing here sensitive ports and mounting code volumes for rapid development and debugging of the server stack. + x-logging: &x-logging logging: driver: 'json-file' options: max-file: 5 max-size: 10m -# WARNING! -# This is a development version of THE Appwrite docker-compose.yml file. -# Avoid using this file in your production environment. -# We're exposing here sensitive ports and mounting code volumes for rapid development and debugging of the server stack. version: '3'