From 94428e5fcdaa1ebf56df63ad979197302f6b686d Mon Sep 17 00:00:00 2001
From: Aditya <60684641+0x0elliot@users.noreply.github.com>
Date: Thu, 6 Apr 2023 01:18:08 +0530
Subject: [PATCH] Fixing docker volumes and adding Fixing #7

---
 buffalogs/buffalogs/celery.py            |   1 -
 buffalogs/buffalogs/settings/settings.py |   1 +
 buffalogs/celerybeat-schedule            | Bin 0 -> 16384 bytes
 buffalogs/requirements.txt               |   1 +
 buffalogs/run_beat.sh                    |   2 +-
 build/Dockerfile                         |   3 +--
 docker-compose.yaml                      |  10 ++++------
 7 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 buffalogs/celerybeat-schedule
 mode change 100644 => 100755 buffalogs/run_beat.sh

diff --git a/buffalogs/buffalogs/celery.py b/buffalogs/buffalogs/celery.py
index c639b21..0815f01 100644
--- a/buffalogs/buffalogs/celery.py
+++ b/buffalogs/buffalogs/celery.py
@@ -18,7 +18,6 @@
 # Load task modules from all registered Django apps.
 app.autodiscover_tasks()
 
-
 # Dump requests
 @app.task(bind=True)
 def debug_task(self):
diff --git a/buffalogs/buffalogs/settings/settings.py b/buffalogs/buffalogs/settings/settings.py
index 19b31a4..6662a61 100644
--- a/buffalogs/buffalogs/settings/settings.py
+++ b/buffalogs/buffalogs/settings/settings.py
@@ -37,6 +37,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "impossible_travel",
+    "django_celery_beat"
 ]
 
 MIDDLEWARE = [
diff --git a/buffalogs/celerybeat-schedule b/buffalogs/celerybeat-schedule
new file mode 100644
index 0000000000000000000000000000000000000000..1233601a86ef18b5eb01fb7fa5aa21c95b603bb5
GIT binary patch
literal 16384
zcmeI3&1(}u7{)ivhV&!B+K3b?r5DMEvaM0^s8Bqmio_IeE}PBZhOC>gyD3c|5HF%I
zw@ek(ix=@I{sVgTB%VEa@*@5Pg3jzr(iMWxf-TCkVdtI9X6AYKx9>dcB_E&N$!Uw4
z7M(nZIH%$(5wD3x(|*W+76d>51V8`;KmY_l00ck)1V8`;K;T~_u%?nmlpw$X90UQ>
z0qOvCfPDZTfDgb2-~;dh_yBwWKJcIUKvM2%Eu*5gAv?S3`?m|S^CBx_qpU6*BItb1
zPkv0Big8H=9Ka#IKTr=xQxBg%e94>U4#_D0Ti~*%_zC_;!ylZ%SrPyTaEKF-{gu0K
zSG%EYUXA%P-Y54t!9OJna5x+X>+$y-@k0Nm+FxnD%+mzkf5toPpmp``O>H^sYuY)*
zbA~Up#Lt7S^S6I5o_Ui5Lw&#u@&4-v&9-NnLwzs$7XZ(grY;+0;|epvJ|7izAr6|{
zu5B_ySTgafx=R{E{gE+QZIANW5yyZPXr|-0Z4v~g+rAetx?mHR_&uXetdP;{ZQCJ@
zu1l`-OnPj@3QmHaxFu(7@d-66XfZn5utE|x?~{0U#5U*CU-eY3xSo7|hEcuK3;R5n
zBDWDMR@p;VWfhGsD#<`;@hsA|-}XYQE)*-PG*MzsPJBW>W5DXg0dGa0p6qsnw&^#6
zmg$lm;xb1sI4d-_9bKsM@hveNCF;zol+LfsJh{l6tjxe!DpcmBz!ZtoV<MK_B3{F^
zU1E9NPNb7}@{={!ms2l4#n+^X4Mr1}rld~OWVh4wNx*Kre;tS$=^FfI{-jiLN)x5h
w*|`V)zS81vxW=jxw6ar<Bb%lxD*-JCfB*=900@8p2!H?xfB*=9z;P1z1)@K=AOHXW

literal 0
HcmV?d00001

diff --git a/buffalogs/requirements.txt b/buffalogs/requirements.txt
index 2244b7a..8aa5314 100644
--- a/buffalogs/requirements.txt
+++ b/buffalogs/requirements.txt
@@ -3,6 +3,7 @@ asgiref==3.5.2
 billiard==3.6.4.0
 black==22.12.0
 celery==5.2.7
+django-celery-beat==2.5.0
 certifi==2022.9.24
 cfgv==3.3.1
 click==8.1.3
diff --git a/buffalogs/run_beat.sh b/buffalogs/run_beat.sh
old mode 100644
new mode 100755
index ae7e09e..c9d2ea7
--- a/buffalogs/run_beat.sh
+++ b/buffalogs/run_beat.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-celery -A buffalogs beat
\ No newline at end of file
+celery -A buffalogs beat -l info --loglevel=debug
\ No newline at end of file
diff --git a/build/Dockerfile b/build/Dockerfile
index 6361e4d..1b6cfee 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.10-slim-bullseye
 ENV INSTALL_PATH /opt/certego
 RUN mkdir -p $INSTALL_PATH
 WORKDIR $INSTALL_PATH
-COPY requirements.txt requirements.txt
+COPY buffalogs/requirements.txt requirements.txt
 
 
 RUN sed -i 's/main/main non-free/g' /etc/apt/sources.list \
@@ -16,7 +16,6 @@ RUN sed -i 's/main/main non-free/g' /etc/apt/sources.list \
 RUN pip install --no-cache-dir -r requirements.txt \
     && rm -f requirements.txt && apt-get -y purge gcc && apt-get -y autoremove && apt-get -y clean
 
-
 COPY buffalogs/ /opt/certego/buffalogs/
 RUN chmod +x /opt/certego/buffalogs/run.sh; chmod +x /opt/certego/buffalogs/run_worker.sh; chmod +x /opt/certego/buffalogs/run_beat.sh;
 WORKDIR /opt/certego/buffalogs/
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2591a86..b139415 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,6 @@
 version: '3.2'
 
 services:
-
     postgres:
         container_name: buffalogs_postgres
         image: postgres:15.1-alpine
@@ -12,7 +11,7 @@ services:
             - postgres_data:/var/lib/postgresql/data
         ports:
             - "127.0.0.1:5432:5432"
-        
+
     elasticsearch:
         container_name: buffalogs_elasticsearch
         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7
@@ -35,8 +34,6 @@ services:
             - "127.0.0.1:9200:9200"
         volumes:
             - elasticsearch_data:/usr/share/elasticsearch/data
-        expose:
-            - "9200"
         healthcheck:
             test: curl -XGET 'localhost:9200/_cluster/health?wait_for_status=yellow&timeout=180s&pretty'
 
@@ -85,12 +82,12 @@ services:
         volumes:
             - django_static:/var/www
             - nginx_sockets:/var/run/nginx-sockets
+            - ./buffalogs:/opt/certego/buffalogs
         depends_on:
             - postgres
             - elasticsearch
             - rabbitmq
 
-
     rabbitmq:
         container_name: rabbitmq
         image: rabbitmq:3.11-management-alpine
@@ -120,6 +117,7 @@ services:
             - ./run_worker.sh
         volumes:
             - ./config:/opt/certego/config:ro
+            - ./buffalogs:/opt/certego/buffalogs
         depends_on:
             - postgres
             - elasticsearch
@@ -138,13 +136,13 @@ services:
             - ./run_beat.sh
         volumes:
             - ./config:/opt/certego/config:ro
+            - ./buffalogs:/opt/certego/buffalogs
         depends_on:
             - postgres
             - elasticsearch
             - rabbitmq
 
 volumes:
-
     elasticsearch_data:
         driver: local
     postgres_data: