From 8dbe4ba7e5a89f9b561685a4985e5164611798ea Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 16 Jul 2020 13:20:52 +0200 Subject: [PATCH] more loggin on strava webhooks --- rowers/tasks.py | 19 +++++++++++++++++-- rowers/views/importviews.py | 9 +++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index 533aea0c..6fc69f27 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -714,6 +714,7 @@ def handle_get_garmin_file(client_id, with open(filename, 'wb') as out_file: shutil.copyfileobj(response.raw, out_file) + del response uploadoptions = { @@ -729,6 +730,7 @@ def handle_get_garmin_file(client_id, session.headers.update(newHeaders) response = session.post(UPLOAD_SERVICE_URL,json=uploadoptions) + return 1 @app.task(bind=True) @@ -2723,7 +2725,14 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu url = "https://www.strava.com/api/v3/activities/"+str(stravaid) response = requests.get(url,headers=headers) if response.status_code != 200: - print(response,response.json()) + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('handle_get_garmin_file response code {code}\n'.format(code=response.status_code)) + f.write('Response json {json}\n'.format(json=response.json())) + return 0 workoutsummary = requests.get(url,headers=headers).json() try: @@ -2955,7 +2964,13 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu session.headers.update(newHeaders) response = session.post(UPLOAD_SERVICE_URL,json=uploadoptions) - + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('handle_get_garmin_file posted file with strava id {stravaid} user id {userid}\n'.format( + stravaid=stravaid,userid=userid)) return 1 diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index e482c9c5..4bc73977 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1071,6 +1071,15 @@ def strava_webhook_view(request): ws = Workout.objects.filter(uploadedtostrava=stravaid) if ws.count()==0: job = stravastuff.async_get_workout(r.user,stravaid) + else: + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('Workouts already existing:\n ') + for w in ws: + f.write('{w} \n'.format(str(w))) elif aspect_type == 'delete': try: stravaid = data['object_id']