From 653cecac6d4d3ee036ab46c74c12752683071c73 Mon Sep 17 00:00:00 2001 From: Fabiano Martins Date: Thu, 6 Feb 2025 00:32:04 -0300 Subject: [PATCH 1/5] Add log level configuration --- docker-compose.production.yml | 1 + docker-compose.staging.yaml | 1 + newrelic.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 0463034a..00ba4613 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -3,3 +3,4 @@ services: environment: CHATFLUX_ENV: Production NEW_RELIC_APP_NAME: "Production Evolution API" + LOG_LEVEL: "DEBUG" diff --git a/docker-compose.staging.yaml b/docker-compose.staging.yaml index 28364812..c5c414c1 100644 --- a/docker-compose.staging.yaml +++ b/docker-compose.staging.yaml @@ -3,3 +3,4 @@ services: environment: CHATFLUX_ENV: Staging NEW_RELIC_APP_NAME: "Staging Evolution API" + LOG_LEVEL: "DEBUG" diff --git a/newrelic.js b/newrelic.js index dfc6320d..7b037470 100644 --- a/newrelic.js +++ b/newrelic.js @@ -2,7 +2,7 @@ exports.config = { app_name: [`${process.env.CHATFLUX_ENV} Evolution API`], license_key: process.env.NEW_RELIC_LICENSE_KEY, logging: { - level: 'trace' + level: process.env.LOG_LEVEL }, allow_all_headers: true, attributes: { From 3d628041d2829044d774be8f0e903a6ef3121a56 Mon Sep 17 00:00:00 2001 From: Fabiano Martins Date: Thu, 6 Feb 2025 22:19:46 -0300 Subject: [PATCH 2/5] Pull WEBHOOK and REDIS configuration from .env --- docker-compose.production.yml | 5 +++++ docker-compose.staging.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 00ba4613..eca7b774 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,6 +1,11 @@ services: api: environment: + NODE_ENV: PROD CHATFLUX_ENV: Production NEW_RELIC_APP_NAME: "Production Evolution API" LOG_LEVEL: "DEBUG" + CACHE_REDIS_ENABLED: "true" + CACHE_LOCAL_ENABLED: "false" + WEBHOOK_EVENTS_ERRORS: "true" + WEBHOOK_EVENTS_ERRORS_WEBHOOK: ${WEBHOOK_EVENTS_ERRORS_WEBHOOK} diff --git a/docker-compose.staging.yaml b/docker-compose.staging.yaml index c5c414c1..c9e151d6 100644 --- a/docker-compose.staging.yaml +++ b/docker-compose.staging.yaml @@ -1,6 +1,9 @@ services: api: environment: + NODE_ENV: PROD CHATFLUX_ENV: Staging NEW_RELIC_APP_NAME: "Staging Evolution API" LOG_LEVEL: "DEBUG" + CACHE_REDIS_ENABLED: "true" + CACHE_LOCAL_ENABLED: "false" From 5915e093c8a7d380614ee62def17e3451ff54d66 Mon Sep 17 00:00:00 2001 From: Fabiano Martins Date: Thu, 6 Feb 2025 22:50:10 -0300 Subject: [PATCH 3/5] Add Redis back --- docker-compose.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index b2c07a4b..6825e915 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -30,6 +30,18 @@ services: extra_hosts: - "host.docker.internal:host-gateway" + redis: + image: redis:7.4.2-alpine + networks: + - evolution-net + container_name: redis + command: > + redis-server --port 6379 --appendonly yes + volumes: + - evolution_redis:/data + ports: + - 6379:6379 + postgres: container_name: postgres build: @@ -52,6 +64,7 @@ services: volumes: evolution_instances: + evolution_redis: postgres_data: From 6ae3d6317fba3ff8b7cf8fc3fb5b62c2318785a4 Mon Sep 17 00:00:00 2001 From: Fabiano Martins Date: Thu, 6 Feb 2025 22:53:43 -0300 Subject: [PATCH 4/5] Remove Redis external port and change Evolution API image --- docker-compose.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6825e915..6d3a54c2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ services: api: container_name: evolution_api - image: ghcr.io/ai-chat-os/evolution-api:v2.2.1 + image: ghcr.io/ai-chat-os/evolution-api:v2.2.1-redis-on restart: always depends_on: - postgres @@ -39,8 +39,6 @@ services: redis-server --port 6379 --appendonly yes volumes: - evolution_redis:/data - ports: - - 6379:6379 postgres: container_name: postgres From 2687bd96366bff48f2e218113270bc8290fea9b2 Mon Sep 17 00:00:00 2001 From: Fabiano Martins Date: Thu, 6 Feb 2025 23:02:16 -0300 Subject: [PATCH 5/5] Fix Redis URL --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6d3a54c2..c63de913 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,6 +12,7 @@ services: # 4- If didn't, CTRL+d to logout # 5- Login to the server # 6- Run env |grep -i relic again; + CACHE_REDIS_URI: redis://redis:6379/6 NEW_RELIC_LICENSE_KEY: ${NEW_RELIC_LICENSE_KEY} NEW_RELIC_NO_CONFIG_FILE: true NEW_RELIC_DISTRIBUTED_TRACING_ENABLED: true