Fix celery broker issue

bibekme · Feb 15, 2023 · e287ab4 · e287ab4
1 parent 3c8ba80
commit e287ab4
Show file tree

Hide file tree

Showing 43 changed files with 25 additions and 18 deletions.
diff --git a/.env.dev-sample b/.env.dev-sample
@@ -8,3 +8,4 @@ SQL_PASSWORD=hello_django
 SQL_HOST=db
 SQL_PORT=5432
 DATABASE=postgres
+CELERY_BROKER_URL=amqp://guest:guest@rabbitmq:5672//
diff --git a/app/Dockerfile → Dockerfile b/app/Dockerfile → Dockerfile
diff --git a/app/Dockerfile.prod → Dockerfile.prod b/app/Dockerfile.prod → Dockerfile.prod
diff --git a/app/core/__init__.py b/app/core/__init__.py
diff --git a/app/common/__init__.py → common/__init__.py b/app/common/__init__.py → common/__init__.py
diff --git a/app/common/admin.py → common/admin.py b/app/common/admin.py → common/admin.py
diff --git a/app/common/apps.py → common/apps.py b/app/common/apps.py → common/apps.py
diff --git a/app/common/migrations/__init__.py → common/migrations/__init__.py b/app/common/migrations/__init__.py → common/migrations/__init__.py
diff --git a/app/common/models.py → common/models.py b/app/common/models.py → common/models.py
diff --git a/app/common/tests.py → common/tests.py b/app/common/tests.py → common/tests.py
diff --git a/app/common/views.py → common/views.py b/app/common/views.py → common/views.py
diff --git a/app/upload/__init__.py → core/__init__.py b/app/upload/__init__.py → core/__init__.py
diff --git a/app/core/asgi.py → core/asgi.py b/app/core/asgi.py → core/asgi.py
diff --git a/app/core/celery.py → core/celery.py b/app/core/celery.py → core/celery.py
diff --git a/app/core/settings.py → core/settings.py b/app/core/settings.py → core/settings.py
@@ -1,11 +1,8 @@
 """
 Django settings for hello_django project.
-
 Generated by 'django-admin startproject' using Django 3.2.6.
-
 For more information on this file, see
 https://docs.djangoproject.com/en/3.2/topics/settings/
-
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
@@ -141,5 +138,5 @@
 AUTH_USER_MODEL = "users.User"
 
 CELERY_BROKER_URL = os.environ.get(
-    "CELERY_BROKER_URL", default="redis://localhost:6379"
+    "CELERY_BROKER_URL", "amqp://guest:guest@rabbit:5672//"
 )
diff --git a/app/core/tasks.py → core/tasks.py b/app/core/tasks.py → core/tasks.py
diff --git a/app/core/urls.py → core/urls.py b/app/core/urls.py → core/urls.py
diff --git a/app/core/wsgi.py → core/wsgi.py b/app/core/wsgi.py → core/wsgi.py
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,11 @@
-version: "3.8"
+version: "3.9"
 
 services:
   web:
-    build: ./app
+    build: .
     command: python manage.py runserver 0.0.0.0:8000
     volumes:
-      - ./app/:/usr/src/app/
+      - ./:/usr/src/app/
     ports:
       - 8000:8000
     env_file:
@@ -20,33 +20,44 @@ services:
       - POSTGRES_USER=hello_django
       - POSTGRES_PASSWORD=hello_django
       - POSTGRES_DB=hello_django_dev
+
   rabbitmq:
+    image: rabbitmq:3-management
     container_name: rabbitmq
-    restart: always
-    image: rabbitmq:3.9-alpine
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-
+    hostname: rabbitmq
+    environment:
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+      - RABBITMQ_DEFAULT_VHOST=/
+    ports:
+      - 5672:5672
+      - 15672:15672
   celeryworker:
     container_name: celeryworker
     restart: always
-    build: ./app
+    build: .
+    env_file:
+      - ./.env.dev
     command: celery -A core worker --pool=prefork -l info
     depends_on:
       - rabbitmq
 
   celeryscheduler:
     container_name: celeryscheduler
     restart: always
-    build: ./app
+    build: .
+    env_file:
+      - ./.env.dev
     command: celery -A core beat -l info
     depends_on:
       - celeryworker
 
   celeryflower:
     container_name: celeryflower
     restart: always
-    build: ./app
+    build: .
+    env_file:
+      - ./.env.dev
     command: celery -A core flower -l info
     ports:
       - 5555:5555
@@ -56,4 +67,3 @@ services:
 
 volumes:
   postgres_data:
-  rabbitmq_data:
diff --git a/app/entrypoint.prod.sh → entrypoint.prod.sh b/app/entrypoint.prod.sh → entrypoint.prod.sh
diff --git a/app/entrypoint.sh → entrypoint.sh b/app/entrypoint.sh → entrypoint.sh
diff --git a/app/manage.py → manage.py b/app/manage.py → manage.py
diff --git a/app/requirements.txt → requirements.txt b/app/requirements.txt → requirements.txt
@@ -7,7 +7,7 @@ click==8.1.3
 click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.2.0
-Django==3.2.6
+Django==4.1.7
 django-shortuuidfield==0.1.3
 flower==1.2.0
 gunicorn==20.1.0

diff --git a/app/upload/migrations/__init__.py → upload/__init__.py b/app/upload/migrations/__init__.py → upload/__init__.py
diff --git a/app/upload/admin.py → upload/admin.py b/app/upload/admin.py → upload/admin.py
diff --git a/app/upload/apps.py → upload/apps.py b/app/upload/apps.py → upload/apps.py
diff --git a/app/users/__init__.py → upload/migrations/__init__.py b/app/users/__init__.py → upload/migrations/__init__.py
diff --git a/app/upload/models.py → upload/models.py b/app/upload/models.py → upload/models.py
diff --git a/app/upload/templates/upload.html → upload/templates/upload.html b/app/upload/templates/upload.html → upload/templates/upload.html
diff --git a/app/upload/tests.py → upload/tests.py b/app/upload/tests.py → upload/tests.py
diff --git a/app/upload/views.py → upload/views.py b/app/upload/views.py → upload/views.py
diff --git a/app/users/migrations/__init__.py → users/__init__.py b/app/users/migrations/__init__.py → users/__init__.py
diff --git a/app/users/admin.py → users/admin.py b/app/users/admin.py → users/admin.py
diff --git a/app/users/apps.py → users/apps.py b/app/users/apps.py → users/apps.py
diff --git a/app/users/managers.py → users/managers.py b/app/users/managers.py → users/managers.py
diff --git a/app/users/migrations/0001_initial.py → users/migrations/0001_initial.py b/app/users/migrations/0001_initial.py → users/migrations/0001_initial.py
diff --git a/...ers/migrations/0002_auto_20230215_1139.py → users/migrations/0002_auto_20230215_1139.py b/...ers/migrations/0002_auto_20230215_1139.py → users/migrations/0002_auto_20230215_1139.py
diff --git a/.../migrations/0003_alter_user_created_on.py → .../migrations/0003_alter_user_created_on.py b/.../migrations/0003_alter_user_created_on.py → .../migrations/0003_alter_user_created_on.py
diff --git a/app/users/migrations/0004_alter_user_idx.py → users/migrations/0004_alter_user_idx.py b/app/users/migrations/0004_alter_user_idx.py → users/migrations/0004_alter_user_idx.py
diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py
diff --git a/app/users/models.py → users/models.py b/app/users/models.py → users/models.py
diff --git a/app/users/tests.py → users/tests.py b/app/users/tests.py → users/tests.py
diff --git a/app/users/views.py → users/views.py b/app/users/views.py → users/views.py