From c4877046ab5f2583e4e34a023a802fdfec93b8a9 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 1 Jul 2018 15:41:23 +0200 Subject: [PATCH] Makefile update --- .gitignore | 5 +++++ Makefile | 4 ++-- Makefile.config | 1 - Makefile.custom.config.example | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db791651..d304cb83 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,8 @@ npm-debug.log* yarn-debug.log* yarn-error.log* .eslintcache + +# ALL +############### +*.log +nohup.out diff --git a/Makefile b/Makefile index 2d040ebf..e5ed6742 100644 --- a/Makefile +++ b/Makefile @@ -49,10 +49,10 @@ run: $(MAKE) P="run-server run-client" make-p run-client: - serve -s fittrackee_client/build -l 3000 + serve -s fittrackee_client/build -l 3000 >> serve.log 2>&1 run-server: - cd fittrackee_api && $(GUNICORN) -b 127.0.0.1:5000 "fittrackee_api:create_app()" + cd fittrackee_api && $(GUNICORN) -b 127.0.0.1:5000 "fittrackee_api:create_app()" --error-logfile ../gunicorn-error.log serve-python: $(FLASK) run --with-threads -h $(HOST) -p $(API_PORT) diff --git a/Makefile.config b/Makefile.config index e95d0327..c0d6416c 100644 --- a/Makefile.config +++ b/Makefile.config @@ -2,7 +2,6 @@ HOST = 0.0.0.0 API_PORT = 5000 CLIENT_PORT = 3000 -export REACT_APP_API_URL = http://$(HOST):$(API_PORT) export FLASK_APP = $(PWD)/fittrackee_api/server.py export APP_SETTINGS=fittrackee_api.config.DevelopmentConfig export FLASK_ENV=development diff --git a/Makefile.custom.config.example b/Makefile.custom.config.example index 85ed02a4..d21607be 100644 --- a/Makefile.custom.config.example +++ b/Makefile.custom.config.example @@ -1,3 +1,4 @@ +export REACT_APP_API_URL = http://$(HOST):$(API_PORT) export REACT_APP_THUNDERFOREST_API_KEY= export WEATHER_API=