Merge pull request #67 from harshraj22/auth_db

Auth db

docker-compose.yml

@@ -18,7 +18,8 @@ services:
     image: harshraj22/dis_sim_similarity
     user: nobody
     depends_on:
-      - redis
+      redis:
+        condition: service_healthy
 
   frontend:
     build: './src/frontend'
@@ -36,6 +37,9 @@ services:
     image: harshraj22/dis_sim_auth
     ports:
       - '8019:8019'
+    depends_on:
+      data_population:
+         condition: service_healthy
 
   redis:
     image: 'redis:4-alpine'
@@ -146,6 +150,11 @@ services:
     environment:
       - REDIS_URL=redis
       - REDIS_PORT=6379
+    healthcheck:
+      test: ["CMD", "python3", "healthcheck.py"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     depends_on:
       redis:
         condition: service_healthy

src/auth/requirements.txt

@@ -4,4 +4,5 @@ passlib
 bcrypt
 fastapi
 uvicorn
-requests
+requests
+python-multipart

src/data_population/healthcheck.py

@@ -0,0 +1,10 @@
+import requests
+
+url = "http://data_population:8020/healthcheck"
+
+try:
+    response = requests.get(url)
+    response.raise_for_status()
+except requests.exceptions.RequestException as e:
+    # The request failed, so exit with a non-zero code to indicate failure
+    exit(1)

src/data_population/populate.py

@@ -56,6 +56,10 @@ def sync_all():
   for username, subscription_tier, request_limit, retention_period in result:
     r.set(f'{ALLOWED_PREFIX}-{username}', request_limit)
 
+@app.get('/healthcheck', status_code=200)
+def healthcheck():
+  return 'OK'
+
 # r.close()
 if __name__ == '__main__':
   requests.get('http://data_population:8020/sync_all/')

src/similarity/models.py

@@ -12,7 +12,7 @@
     broker='redis://redis:6379/0'
 )
 
-redis_slave_urls = os.environ.get('REDIS_SLAVE_URLS', 'redis://localhost:6379/0').split(',')
+redis_slave_urls = os.environ.get('REDIS_SLAVE_URLS', 'redis://redis:6379/0').split(',')
 # REDIS_SLAVE_URLS=redis://slave1:6379,redis://slave2:6379,redis://slave3:6379
 
 result_backend_transport_options = {
@@ -30,15 +30,15 @@
     'fanout_ttl': 600,
     'fanout_retry': True,
     'fanout_transport_options': {
-        'master': 'redis://localhost:6379/0',
+        'master': 'redis://redis:6379/0',
         'slaves': redis_slave_urls
     }
 }
 
-app.conf.update(
-    result_backend='redis',
-    result_backend_transport_options=result_backend_transport_options
-)
+# app.conf.update(
+#     result_backend='redis',
+#     result_backend_transport_options=result_backend_transport_options
+# )
 
 # frequency with which Celery checks for changes in environment variables
 app.conf.beat_max_loop_interval = 60