celery/worker fixes

Lars Solberg · Lars Solberg · commit 644aef9bd5a9 · 2020-04-09T23:05:04.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,5 +11,5 @@ before_install:
 
 script:
   - docker-compose build
-  - docker-compose run -e DONTSTART=api `bash <(curl -s https://codecov.io/env)` api /data/opa/scripts/release-test.sh
+  - docker-compose run -e MODE=manual `bash <(curl -s https://codecov.io/env)` api /data/opa/scripts/release-test.sh
   - curl -X POST ${CONTAINER_BUILD_TRIGGER}
diff --git a/api/root/etc/services.d/api/run b/api/root/etc/services.d/api/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv sh
 
-[[ "${DONTSTART}" == "api" || "${MODE}" == "worker" || "${MODE}" == "manual" ]] && ( /usr/bin/s6-stopdisable api && exit 0 )
+[[ "${MODE:-api}" == "api" ]] || ( /usr/bin/s6-stopdisable api && exit 0 )
 
 cd /data
 
diff --git a/api/root/etc/services.d/worker/run b/api/root/etc/services.d/worker/run
@@ -1,8 +1,7 @@
 #!/usr/bin/with-contenv sh
 
-[[ "${DONTSTART}" == "worker" || "${MODE}" == "api" || "${MODE}" == "manual" ]] && ( /usr/bin/s6-stopdisable worker && exit 0 )
+[[ "${MODE}" == "worker" ]] || ( /usr/bin/s6-stopdisable worker && exit 0 )
 
 cd /data
 
-exec sleep 1000
-
+exec celery worker -A opa.main ${CELERY_PARAMS}
diff --git a/examples/docker-compose/celery-task/docker-compose.yaml b/examples/docker-compose/celery-task/docker-compose.yaml
@@ -10,6 +10,14 @@ services:
     volumes:
       - ./plugins:/plugins
 
+  worker:
+    image: opastack/api:latest
+    environment:
+      OPA_PLUGIN_PATHS: "/plugins"
+      MODE: "worker"
+    volumes:
+      - ./plugins:/plugins
+
   redis:
     image: "redis:5"
 
diff --git a/examples/docker-compose/celery-task/plugins/celerydemo/__init__.py b/examples/docker-compose/celery-task/plugins/celerydemo/__init__.py
@@ -1,4 +1,4 @@
-from opa import get_router, Hook, get_instance, app
+from opa import get_router, Hook, get_instance
 
 
 class celery_config(Hook):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from opa import get_router, Hook, get_instance, app`
	`1`	`+from opa import get_router, Hook, get_instance`
`2`	`2`
`3`	`3`
`4`	`4`	`class celery_config(Hook):`