diff --git a/apilog.log b/apilog.log index 06d4998a..e19acd55 100644 --- a/apilog.log +++ b/apilog.log @@ -20,3 +20,59 @@ No data in request No data in request 1595667900.0: sander(strokedatajson_v2 POST - data parsed) 2020-12-31 05:51:52.185284+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 05:59:52.889322+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 05:59:54.598443+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:01:15.553477+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:01:17.410378+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:02:02.098587+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:02:03.864872+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:03:31.462548+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:03:33.169393+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:05:44.285370+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:05:46.002410+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:07:49.175386+00:00: sander (strokedatajson_v2 POST) +No data in request +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:07:50.792027+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:09:10.741327+00:00: sander (strokedatajson_v2 POST) +{"distance": 5, "power": 112, "hr": 132, "pace": 145800, "time": 0, "spm": 11, "latitude": 52.2264097, "longitude": 6.8493638} +{"distance": 12, "power": 221, "hr": 131, "pace": 116400, "time": 2200, "spm": 41, "latitude": 52.2263474, "longitude": 6.8495814} +{"distance": 19, "power": 511, "hr": 131, "pace": 88100, "time": 4599, "spm": 56, "latitude": 52.2262715, "longitude": 6.8496975} +{"distance": 27, "power": 673, "hr": 132, "pace": 80400, "time": 7000, "spm": 59, "latitude": 52.2262003, "longitude": 6.8498095} +{"distance": 35, "power": 744, "hr": 133, "pace": 77700, "time": 9599, "spm": 55, "latitude": 52.2261312, "longitude": 6.8499267} +{"distance": 43, "power": 754, "hr": 136, "pace": 77400, "time": 12000, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 51, "power": 754, "hr": 139, "pace": 77400, "time": 14400, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 59, "power": 749, "hr": 142, "pace": 77600, "time": 16799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 67, "power": 729, "hr": 145, "pace": 78300, "time": 19400, "spm": 48, "latitude": 52.2257749, "longitude": 6.8503918} +{"distance": 75, "power": 729, "hr": 147, "pace": 78300, "time": 21799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 82, "power": 726, "hr": 150, "pace": 78400, "time": 24200, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 90, "power": 709, "hr": 152, "pace": 79000, "time": 26599, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 100, "power": 707, "hr": 153, "pace": 79100, "time": 29000, "spm": 49, "latitude": 52.2261312, "longitude": 6.8499267} +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:09:12.451036+00:00: sander (strokedatajson_v2 POST completed successfully) +2020-12-31 06:10:46.757769+00:00: sander (strokedatajson_v2 POST) +{"distance": 5, "power": 112, "hr": 132, "pace": 145800, "time": 0, "spm": 11, "latitude": 52.2264097, "longitude": 6.8493638} +{"distance": 12, "power": 221, "hr": 131, "pace": 116400, "time": 2200, "spm": 41, "latitude": 52.2263474, "longitude": 6.8495814} +{"distance": 19, "power": 511, "hr": 131, "pace": 88100, "time": 4599, "spm": 56, "latitude": 52.2262715, "longitude": 6.8496975} +{"distance": 27, "power": 673, "hr": 132, "pace": 80400, "time": 7000, "spm": 59, "latitude": 52.2262003, "longitude": 6.8498095} +{"distance": 35, "power": 744, "hr": 133, "pace": 77700, "time": 9599, "spm": 55, "latitude": 52.2261312, "longitude": 6.8499267} +{"distance": 43, "power": 754, "hr": 136, "pace": 77400, "time": 12000, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 51, "power": 754, "hr": 139, "pace": 77400, "time": 14400, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 59, "power": 749, "hr": 142, "pace": 77600, "time": 16799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 67, "power": 729, "hr": 145, "pace": 78300, "time": 19400, "spm": 48, "latitude": 52.2257749, "longitude": 6.8503918} +{"distance": 75, "power": 729, "hr": 147, "pace": 78300, "time": 21799, "spm": 48, "latitude": 52.2259154, "longitude": 6.8502769} +{"distance": 82, "power": 726, "hr": 150, "pace": 78400, "time": 24200, "spm": 48, "latitude": 52.2259872, "longitude": 6.8501561} +{"distance": 90, "power": 709, "hr": 152, "pace": 79000, "time": 26599, "spm": 48, "latitude": 52.2260576, "longitude": 6.8500366} +{"distance": 100, "power": 707, "hr": 153, "pace": 79100, "time": 29000, "spm": 49, "latitude": 52.2261312, "longitude": 6.8499267} +1595667900.0: sander(strokedatajson_v2 POST - data parsed) +2020-12-31 06:10:48.555945+00:00: sander (strokedatajson_v2 POST completed successfully) diff --git a/rowers/uploads.py b/rowers/uploads.py index b122e3df..0104a2fd 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -542,7 +542,6 @@ def do_sync(w,options, quick=False): w.uploadedtogarmin = options['garminid'] w.save() except KeyError: - print('keyerror') pass diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index b8ceaf67..333a281c 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -7,6 +7,8 @@ from rowers.views.statements import * from rowers.tasks import handle_calctrimp from rowers.mailprocessing import send_confirm +import sys + # Stroke data form to test API upload @login_required() def strokedataform(request,id=0): @@ -118,10 +120,14 @@ def strokedatajson_v2(request,id): logfile.write(str(timezone.now())+": ") logfile.write(request.user.username+" (strokedatajson_v2 POST) \n") try: - logfile.write(request.data['data']+"\n") + for d in request.data['data']: + logfile.write(json.dumps(d)) + logfile.write("\n") except KeyError: try: - logfile.write(request.data['strokedata']+"\n") + for d in request.data['strokedata']: + logfile.write(json.dumps(d)) + logfile.write("\n") except KeyError: logfile.write("No data in request.data\n") except (AttributeError,TypeError):