Skip to content

Commit

Permalink
Makefile: Do not daemonize background task
Browse files Browse the repository at this point in the history
  • Loading branch information
rmader authored and fuzzylogic2000 committed Apr 2, 2020
1 parent 538b3d6 commit 45e40f7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 45e40f7

Please sign in to comment.