Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: Do not daemonize background task #1798

Merged
merged 1 commit into from
Apr 2, 2020
Merged

Makefile: Do not daemonize background task #1798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Makefile
View file
Open in desktop
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