Skip to content

Commit 96003aa

Browse files
committed
fix(analytics): boot when POSTGRES/RABBITMQ env vars are missing (issue #126)
1 parent 7e04c02 commit 96003aa

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ services:
245245
- "8003:8003"
246246
environment:
247247
- POSTGRES_URL=postgresql://${POSTGRES_USER:-atlas_user}:${POSTGRES_PASSWORD:-atlas_password}@postgres:5432/${POSTGRES_DB:-atlas_db}
248+
- POSTGRES_USER=${POSTGRES_USER:-atlas_user}
249+
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-atlas_password}
250+
- RABBITMQ_HOST=rabbitmq
251+
- RABBITMQ_USER=${RABBITMQ_USER:-atlas_rabbit}
252+
- RABBITMQ_PASSWORD=${RABBITMQ_PASS:-changeme_rabbit_pass}
248253
- ALLOWED_ORIGINS=${ALLOWED_ORIGINS:-http://localhost:3000}
249254
networks:
250255
- atlas-network

services/analytics-python-service/main.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ async def internal_auth_middleware(request: Request, call_next):
107107
return await call_next(request)
108108

109109

110-
POSTGRES_USER = os.environ["POSTGRES_USER"]
111-
POSTGRES_PASSWORD = os.environ["POSTGRES_PASSWORD"]
110+
POSTGRES_USER = os.environ.get("POSTGRES_USER", "atlas_user")
111+
POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD", "atlas_password")
112112
POSTGRES_HOST = os.environ.get("POSTGRES_HOST", "postgres")
113113
POSTGRES_DB = os.environ.get("POSTGRES_DB", "atlas_db")
114114
DATABASE_URL = os.environ.get(
@@ -133,7 +133,7 @@ def health_check():
133133

134134

135135
RABBITMQ_URL = os.environ.get("RABBITMQ_URL", "")
136-
RABBITMQ_HOST = os.environ.get("RABBITMQ_HOST", "localhost")
136+
RABBITMQ_HOST = os.environ.get("RABBITMQ_HOST", "rabbitmq")
137137
RABBITMQ_PORT = int(os.environ.get("RABBITMQ_PORT", "5672"))
138138
RABBITMQ_USER = os.environ.get("RABBITMQ_USER", "guest")
139139
RABBITMQ_PASSWORD = os.environ.get("RABBITMQ_PASSWORD", "guest")
@@ -148,7 +148,6 @@ def _rabbitmq_params():
148148
credentials=pika.PlainCredentials(RABBITMQ_USER, RABBITMQ_PASSWORD),
149149
)
150150

151-
152151
EMPLOYEE_SERVICE_URL = os.environ.get("EMPLOYEE_SERVICE_URL", "http://employee-service:8001")
153152

154153

0 commit comments

Comments
 (0)