sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v16.7.5'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-11-10 07:49:23 +01:00
parent 9de7069b88 6efae814af
commit 3d594c9c15
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/tasks.py
View File

@@ -330,12 +330,16 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
try: try:
res = act.wait(poll_interval=1.0, timeout=10) res = act.wait(poll_interval=1.0, timeout=10)
except stravalib.exc.ActivityUploadFailed: # pragma: no cover except stravalib.exc.ActivityUploadFailed: # pragma: no cover
dologging('strava_fail.log','Strava upload failed for Workout {id} ActivityUploadFailed'.format(id=workoutid))
failed = True failed = True
except JSONDecodeError: # pragma: no cover except JSONDecodeError: # pragma: no cover
dologging('strava_fail.log','Strava upload failed for Workout {id} JSONDecodeError'.format(id=workoutid))
failed = True failed = True
except stravalib.exc.ObjectNotFound: # pragma: no cover except stravalib.exc.ObjectNotFound: # pragma: no cover
dologging('strava_fail.log','Strava upload failed for Workout {id} ObjectNotFound'.format(id=workoutid))
failed = True failed = True
except IndexError: # pragma: no cover except IndexError: # pragma: no cover
dologging('strava_fail.log','Strava upload failed for Workout {id} IndexError'.format(id=workoutid))
failed = True failed = True
except (ActivityUploadFailed, stravalib.exc.RateLimitExceeded): # pragma: no cover except (ActivityUploadFailed, stravalib.exc.RateLimitExceeded): # pragma: no cover
dologging('strava_fail.log','Strava upload failed for Workout {id}'.format(id=workoutid)) dologging('strava_fail.log','Strava upload failed for Workout {id}'.format(id=workoutid))

2
rowers/views/paymentviews.py
View File

@@ -243,7 +243,7 @@ def purchase_checkouts_view(request):
p.rowers.add(r) p.rowers.add(r)
create_sessions_from_json(plansteps,r,startdate,r.user) create_sessions_from_json(plansteps,r,startdate,r.user)
print('aap')
job = myqueue(queuehigh,handle_send_email_instantplan_notification, job = myqueue(queuehigh,handle_send_email_instantplan_notification,
r.user.username, r.user.username,
r.user.email, r.user.email,