From 1d39b5a646671d214f3245c045f14a4c4b46cdeb Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Fri, 21 Feb 2020 15:02:24 -0800
Subject: [PATCH] more generic catch in uploader and thermald

old-commit-hash: 891c4cabb8c1909e981d902b36b0f3bfb529ad16
---
 selfdrive/loggerd/uploader.py | 2 +-
 selfdrive/thermald.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py
index 1d9a261f0b..dba2287b8c 100644
--- a/selfdrive/loggerd/uploader.py
+++ b/selfdrive/loggerd/uploader.py
@@ -72,7 +72,7 @@ def is_on_wifi():
     if result is None:
       return True
     return 'WIFI' in result
-  except (AttributeError, subprocess.CalledProcessError):
+  except Exception:
     cloudlog.exception("is_on_wifi failed")
     return False
 
diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py
index 6c4f298fd4..d2b9ddbdf7 100755
--- a/selfdrive/thermald.py
+++ b/selfdrive/thermald.py
@@ -196,7 +196,7 @@ def thermald_thread():
     if (count % int(10. / DT_TRML)) == 0:
       try:
         network_type = get_network_type()
-      except subprocess.CalledProcessError:
+      except Exception:
         pass
 
     msg.thermal.freeSpace = get_available_percent(default=100.0) / 100.0