Merge branch 'release/v18.5.4'

rowers/management/commands/processemail.py

@@ -110,7 +110,9 @@ class Command(BaseCommand):
         try:
             rowers = Rower.objects.filter(nk_auto_import=True)
             for r in rowers:  # pragma: no cover
+                dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id))
                 if user_is_not_basic(r.user):
+                    dologging("nklog.log","User is not basic")
                     _ = nkstuff.get_nk_workouts(r)
         except:  # pragma: no cover
             exc_type, exc_value, exc_traceback = sys.exc_info()

rowers/nkstuff.py

@@ -93,6 +93,7 @@ def get_nk_workouts(rower, do_async=True, before=0, after=0):
     try:
         _ = nk_open(rower.user)
     except NoTokenError:  # pragma: no cover
+        dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id))
         return 0
 
     res = get_nk_workout_list(rower.user, before=before, after=after)

rowers/tasks.py

@@ -2978,8 +2978,8 @@ def handle_nk_async_workout(alldata, userid, nktoken, nkid, delaysec, defaulttim
     jsonData = response.json()
     strokeData = jsonData[str(nkid)]
 
-    dologging('nklog.log', json.dumps(data))
-    dologging('nklog.log', json.dumps(strokeData))
+    #dologging('nklog.log', json.dumps(data))
+    #dologging('nklog.log', json.dumps(strokeData))
 
     df = strokeDataToDf(strokeData)