Merge branch 'release/v16.6.7'

rowers/stravastuff.py

@@ -79,7 +79,7 @@ def get_token(code):
 def strava_open(user):
     t = time.localtime()
     timestamp = time.strftime('%b-%d-%Y_%H%M', t)
-    with open('strava_webhooks.log','a') as f:
+    with open('strava_open.log','a') as f:
         f.write('\n')
         f.write(timestamp)
         f.write(' ')
@@ -446,7 +446,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description='',
 
     try:
         if quick: # pragma: no cover
-            res = act.wait(poll_interval=1.0, timeout=10)
+            res = act.wait(poll_interval=2.0, timeout=10)
             message = 'Workout successfully synchronized to Strava'
         else:
             res = act.wait(poll_interval=5.0,timeout=30)

rowers/tasks.py

@@ -328,7 +328,7 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
             try:
                 act = client.upload_activity(f,'tcx.gz',name=name)
                 try:
-                    res = act.wait(poll_interval=1.0, timeout=60)
+                    res = act.wait(poll_interval=1.0, timeout=10)
                 except stravalib.exc.ActivityUploadFailed: # pragma: no cover
                     failed = True
                 except JSONDecodeError: # pragma: no cover