- Debugging of redis setup issues

- Debugging of celery startup
- Moved flower to a standard image iso own build
This commit is contained in:
Josako
2025-09-02 10:25:17 +02:00
parent 593dd438aa
commit 84afc0b2ee
7 changed files with 99 additions and 48 deletions

View File

@@ -209,7 +209,7 @@ if [ $# -eq 0 ]; then
SERVICES=()
while IFS= read -r line; do
SERVICES+=("$line")
done < <(yq e '.services | keys | .[]' compose_dev.yaml | grep -E '^(nginx|eveai_|flower|prometheus|grafana)')
done < <(yq e '.services | keys | .[]' compose_dev.yaml | grep -E '^(nginx|eveai_|prometheus|grafana)')
else
SERVICES=("$@")
fi
@@ -236,14 +236,14 @@ for SERVICE in "${SERVICES[@]}"; do
if [[ "$SERVICE" == "nginx" ]]; then
./copy_specialist_svgs.sh ../config ../nginx/static/assets 2>/dev/null || echo "Warning: copy_specialist_svgs.sh not found or failed"
fi
if [[ "$SERVICE" == "nginx" || "$SERVICE" == eveai_* || "$SERVICE" == "flower" || "$SERVICE" == "prometheus" || "$SERVICE" == "grafana" ]]; then
if [[ "$SERVICE" == "nginx" || "$SERVICE" == eveai_* || "$SERVICE" == "prometheus" || "$SERVICE" == "grafana" ]]; then
if process_service "$SERVICE"; then
echo "✅ Successfully processed $SERVICE"
else
echo "❌ Failed to process $SERVICE"
fi
else
echo "⏭️ Skipping $SERVICE as it's not nginx, flower, prometheus, grafana or doesn't start with eveai_"
echo "⏭️ Skipping $SERVICE as it's not nginx, prometheus, grafana or doesn't start with eveai_"
fi
done

View File

@@ -74,7 +74,7 @@ services:
WORKERS: 1 # Dev: lagere concurrency
WORKER_CLASS: gevent
WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn
LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100
volumes:
@@ -114,9 +114,10 @@ services:
COMPONENT_NAME: eveai_workers
ROLE: worker
CELERY_CONCURRENCY: 1 # Dev: lagere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery
CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: embeddings
volumes:
- ../eveai_workers:/app/eveai_workers
- ../common:/app/common
@@ -151,7 +152,7 @@ services:
WORKERS: 1 # Dev: lagere concurrency
WORKER_CLASS: gevent
WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn
LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100
volumes:
@@ -189,9 +190,10 @@ services:
COMPONENT_NAME: eveai_chat_workers
ROLE: worker
CELERY_CONCURRENCY: 8 # Dev: lagere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery
CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: llm_interactions
volumes:
- ../eveai_chat_workers:/app/eveai_chat_workers
- ../common:/app/common
@@ -224,7 +226,7 @@ services:
WORKERS: 1 # Dev: lagere concurrency
WORKER_CLASS: gevent
WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn
LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100
volumes:
@@ -285,9 +287,10 @@ services:
COMPONENT_NAME: eveai_entitlements
ROLE: worker
CELERY_CONCURRENCY: 1 # Dev: lagere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery
CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: entitlements
volumes:
- ../eveai_entitlements:/app/eveai_entitlements
- ../common:/app/common
@@ -341,21 +344,33 @@ services:
networks:
- eveai-dev-network
# flower:
# image: ${REGISTRY_PREFIX:-}josakola/flower:latest
# build:
# context: ..
# dockerfile: ./docker/flower/Dockerfile
# environment:
# <<: *common-variables
# volumes:
# - ../scripts:/app/scripts
# ports:
# - "3007:5555" # Dev Flower volgens port schema
# depends_on:
# - redis
# networks:
# - eveai-dev-network
flower:
image: ${REGISTRY_PREFIX:-}josakola/flower:latest
build:
context: ..
dockerfile: ./docker/flower/Dockerfile
image: mher/flower:latest
environment:
<<: *common-variables
volumes:
- ../scripts:/app/scripts
- CELERY_BROKER_URL=redis://redis:6379/0
- FLOWER_BASIC_AUTH=Felucia:Jungles
- FLOWER_URL_PREFIX=/flower
- FLOWER_PORT=8080
ports:
- "3007:5555" # Dev Flower volgens port schema
- "3007:8080"
depends_on:
- redis
networks:
- eveai-dev-network
minio:
image: minio/minio