From fe2b29b090b201ec4eaf7f03f3f25b1e96403e5a Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Thu, 2 Apr 2020 14:14:46 +0200 Subject: [PATCH] Makefile: Do not daemonize background task --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 566673809..f2f9a55cd 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ help: @echo " make fixtures -- load example data" @echo " make server -- start a dev server" @echo " make watch -- start a dev server and rebuild js and css files on changes" - @echo " make background -- start a dev server, rebuild js and css files on changes, and start background processes" + @echo " make background -- start background processes" @echo " make test -- tests on exiting database" @echo " make test-lastfailed -- run test that failed last" @echo " make test-clean -- test on new database" @@ -60,10 +60,7 @@ watch: .PHONY: background background: - trap 'kill %1; kill %2' KILL; \ - npm run watch & \ - $(VIRTUAL_ENV)/bin/python3 manage.py process_tasks & \ - $(VIRTUAL_ENV)/bin/python3 manage.py runserver 8001 + $(VIRTUAL_ENV)/bin/python3 manage.py process_tasks .PHONY: test test: