diff --git a/rowers/tasks.py b/rowers/tasks.py index da29dfa6..012b83e0 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -3720,7 +3720,6 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec, dologging('c2_import.log', 'Upload API returned status code {code}'.format( code=response.status_code)) - dologging('c2_import.log',json.dumps(response.data)) return 0 workoutid = response.json()['id'] diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 9e6656c4..b79ad510 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -5270,7 +5270,7 @@ def workout_upload_api(request): try: secret = post_data['secret'] except KeyError: - dologging('c2_import.log','Missing credentials') + dologging('own_api.log','Missing credentials') message = {'status': 'false', 'message': 'missing credentials'} return JSONResponse(status=400, data=message) if secret != settings.UPLOAD_SERVICE_SECRET: @@ -5292,11 +5292,11 @@ def workout_upload_api(request): f2 = 'media/'+f1 copyfile(fstr, f2) except KeyError: - dologging('c2_import.log','no filename given') + dologging('own_api.log','no filename given') message = {'status': 'false', 'message': 'no filename given'} return JSONResponse(status=400, data=message) except FileNotFoundError: - dologging('c2_import.log','could not find file') + dologging('own_api.log','could not find file') message = {'status': 'false', 'message': 'could not find file'} return JSONResponse(status=400, data=message) @@ -5360,16 +5360,19 @@ def workout_upload_api(request): break if r is not None and r.emailalternatives is not None: if post_data['useremail'] not in r.emailalternatives: # pragma: no cover + dologging('own_api.log','could not find user by email') message = {'status': 'false', 'message': 'could not find user'} return JSONResponse(status=400, data=message) if r is None: # pragma: no cover + dologging('own_api.log','invalid user') message = {'status': 'false', 'message': 'invalid user'} return JSONResponse(status=400, data=message) notes = form.cleaned_data['notes'] if optionsform.is_valid(): + dologging('own_api.log','invalid options form') make_plot = optionsform.cleaned_data['make_plot'] plottype = optionsform.cleaned_data['plottype'] makeprivate = optionsform.cleaned_data['makeprivate'] @@ -5378,6 +5381,7 @@ def workout_upload_api(request): return JSONResponse(status=400, data=message) if r is None: # pragma: no cover + dologging('own_api.log','r is None') message = {'status': 'false', 'message': 'something went wrong'} return JSONResponse(status=400, data=message)