diff --git a/rowers/tasks.py b/rowers/tasks.py index 39ed253f..d4009972 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -10,6 +10,7 @@ import rowingdata from rowingdata import main as rmain from rowingdata import rowingdata as rdata import rowingdata +from async_messages import message_user,messages from matplotlib.backends.backend_agg import FigureCanvas #from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas @@ -17,6 +18,8 @@ import matplotlib.pyplot as plt from matplotlib import figure import stravalib + +from django_rq import job from utils import serialize_list,deserialize_list @@ -25,6 +28,10 @@ from rowers.dataprepnodjango import new_workout_from_file from django.core.mail import send_mail, BadHeaderError,EmailMessage + + + + # testing task @app.task def add(x, y): diff --git a/rowers/tasks_standalone.py b/rowers/tasks_standalone.py new file mode 100644 index 00000000..eefcba08 --- /dev/null +++ b/rowers/tasks_standalone.py @@ -0,0 +1,23 @@ +if __name__ == '__main__': + import django + from django.conf import settings + django.setup() + +import time +from celery import app +from django_rq import job +from async_messages import message_user,messages +from rowers.models import Workout +from django.contrib.auth.models import User + +@app.task +@job +def addcomment2(userid,id): + print 'aap' + 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 diff --git a/rowers/views.py b/rowers/views.py index dfe743d3..63340e0c 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2182,15 +2182,15 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False): 'teams':get_my_teams(request.user), }) -from rowers.tpstuff import addcomment +from rowers.tasks_standalone import addcomment2 from django.contrib import messages # Test asynchronous tasking and messaging @login_required() def workout_test_task_view(request,id=0): row = Workout.objects.get(id=id) - res = addcomment(request.user.id,row.id) + res = addcomment2(request.user.id,row.id) - res = addcomment.delay(request.user.id,row.id) + res = addcomment2.delay(request.user.id,row.id) messages.error(request,'Let op, Sander!')