uploader: allow ctrl+c

old-commit-hash: 13ec384ea0
commatwo_master
Greg Hogan 5 years ago
parent 6987c5136b
commit 41ff9244c0
  1. 8
      selfdrive/loggerd/uploader.py

@ -76,7 +76,7 @@ def is_on_wifi():
if result is None: if result is None:
return True return True
return 'WIFI' in result return 'WIFI' in result
except BaseException: except Exception:
cloudlog.exception("is_on_wifi failed") cloudlog.exception("is_on_wifi failed")
return False return False
@ -90,7 +90,7 @@ def is_on_hotspot():
is_entune = result.startswith('10.0.2.') is_entune = result.startswith('10.0.2.')
return (is_android or is_ios or is_entune) return (is_android or is_ios or is_entune)
except BaseException: except Exception:
return False return False
class Uploader(): class Uploader():
@ -177,7 +177,7 @@ class Uploader():
else: else:
with open(fn, "rb") as f: with open(fn, "rb") as f:
self.last_resp = requests.put(url, data=f, headers=headers, timeout=10) self.last_resp = requests.put(url, data=f, headers=headers, timeout=10)
except BaseException as e: except Exception as e:
self.last_exc = (e, traceback.format_exc()) self.last_exc = (e, traceback.format_exc())
raise raise
@ -187,7 +187,7 @@ class Uploader():
try: try:
self.do_upload(key, fn) self.do_upload(key, fn)
except BaseException: except Exception:
pass pass
return self.last_resp return self.last_resp

Loading…
Cancel
Save