From 2aa1e7149f1a7e008580b661268e06e6c4e39f27 Mon Sep 17 00:00:00 2001
From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Tue, 13 Nov 2018 01:17:18 +0200
Subject: [PATCH] Use 'djangoctl.sh' to run Celery

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
---
 bin/djangoctl.sh   | 38 ++++++++++++++++++++++++++++----------
 docker-compose.yml |  4 +++-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/bin/djangoctl.sh b/bin/djangoctl.sh
index 0047153..a9f4600 100755
--- a/bin/djangoctl.sh
+++ b/bin/djangoctl.sh
@@ -31,6 +31,9 @@ COMMANDS:
   run                   Run WSGI HTTP server
   develop [SOURCE_DIR]  Run application in development mode, optionally
                          installing SOURCE_DIR in editable mode
+  develop_celery [SOURCE_DIR]
+                        Run celery, optionally installing SOURCE_DIR
+                         in editable mode
 
 OPTIONS:
   --help                Print usage
@@ -44,26 +47,41 @@ prepare() {
 	"$MANAGE_CMD" migrate --noinput
 }
 
+install_editable() {
+	pip install \
+	    --no-cache-dir \
+	    --no-deps \
+	    -r "${1}/requirements-dev.txt"
+	pip install \
+	    --no-cache-dir \
+	    --no-deps \
+	    --ignore-installed \
+	    -e "${1}"
+}
+
 start() {
 	exec "$MANAGE_CMD" runserver 0.0.0.0:8000
 }
 
+start_celery() {
+	exec celery -A db worker -B -l INFO
+}
+
 develop() {
 	if [ -d "$1" ]; then
-		pip install \
-		    --no-cache-dir \
-		    --no-deps \
-		    -r "${1}/requirements-dev.txt"
-		pip install \
-		    --no-cache-dir \
-		    --no-deps \
-		    --ignore-installed \
-		    -e "${1}"
+		install_editable "$1"
 	fi
 	prepare
 	start
 }
 
+develop_celery() {
+	if [ -d "$1" ]; then
+		install_editable "$1"
+	fi
+	start_celery
+}
+
 initialize() {
 	"$MANAGE_CMD" initialize
 }
@@ -76,7 +94,7 @@ parse_args() {
 				command="$arg"
 				break
 				;;
-			develop)
+			develop|develop_celery)
 				shift
 				subargs="$1"
 				command="$arg"
diff --git a/docker-compose.yml b/docker-compose.yml
index 066f5c0..12ac2ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,9 @@ services:
       DATABASE_URL: 'mysql://satnogsdb:satnogsdb@db/satnogsdb'
       CELERY_BROKER_URL: 'redis://redis:6379/0'
       CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
-    command: ["celery", "-A", "db", "worker", "-B", "-l", "INFO"]
+    command: ["djangoctl.sh", "develop_celery", "/usr/local/src/satnogs-db"]
+    volumes:
+      - '.:/usr/local/src/satnogs-db:z'
   web:
     build:
       context: '.'