From ac2bdbce3ddfa7de5d45542c64abde2534185b65 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 10 May 2017 16:57:12 +0200 Subject: [PATCH] improved standalone tasks --- rowers/dataprepnodjango.py | 3 ++- rowers/tasks_standalone.py | 8 +++----- rowers/tpstuff.py | 11 ----------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 1acccf44..8872d4e7 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -232,7 +232,8 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower', message = "Warning: This workout probably already exists in the database" - w = Workout(user=r,name=title,date=workoutdate, + + w = Workout(user=r,name=title,date=workoutdate, workouttype=workouttype, duration=duration,distance=totaldist, weightcategory=r.weightcategory, diff --git a/rowers/tasks_standalone.py b/rowers/tasks_standalone.py index eefcba08..ffbc269b 100644 --- a/rowers/tasks_standalone.py +++ b/rowers/tasks_standalone.py @@ -1,7 +1,5 @@ -if __name__ == '__main__': - import django - from django.conf import settings - django.setup() +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "rowsandall_app.settings") import time from celery import app @@ -13,7 +11,7 @@ from django.contrib.auth.models import User @app.task @job def addcomment2(userid,id): - print 'aap' + print 'aap met standalone' time.sleep(5) w = Workout.objects.get(id=id) w.notes += '\n the task has run' diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index bf7fdc11..7331a512 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -49,17 +49,6 @@ from django_rq import job import time from async_messages import message_user,messages -@app.task -@job -def addcomment(userid,id): - time.sleep(5) - w = Workout.objects.get(id=id) - w.notes += '\n the task has run' - w.save() - u = User.objects.get(id=userid) - messages.info(u,' The task has run') - return 1 - # Custom error class - to raise a NoTokenError