retropilot/openpilot
retropilot/openpilot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

handle ignored uploads more gracefully

Browse source
This commit is contained in:
Greg Hogan 2020-04-09 21:59:16 -07:00
parent ef8aaa77b7
commit 85a09b3113
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
selfdrive/loggerd/uploader.py
View file

@ -163,6 +163,10 @@ class Uploader():
def do_upload(self, key, fn):
try:
url_resp = self.api.get("v1.3/"+self.dongle_id+"/upload_url/", timeout=10, path=key, access_token=self.api.get_token())
if url_resp.status_code == 412:
self.last_resp = url_resp
return
url_resp_json = json.loads(url_resp.text)
url = url_resp_json['url']
headers = url_resp_json['headers']
@ -213,8 +217,8 @@ class Uploader():
else:
cloudlog.info("uploading %r", fn)
stat = self.normal_upload(key, fn)
if stat is not None and stat.status_code in (200, 201):
cloudlog.event("upload_success", key=key, fn=fn, sz=sz)
if stat is not None and stat.status_code in (200, 201, 412):
cloudlog.event("upload_success" if stat.status_code != 412 else "upload_ignored", key=key, fn=fn, sz=sz)
try:
# tag file as uploaded
setxattr(fn, UPLOAD_ATTR_NAME, UPLOAD_ATTR_VALUE)