From 0100cf90f2b78de638e6e48d83ea618fdce5b250 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 8 Dec 2018 13:24:49 -0600 Subject: [PATCH] UserSettingsHub - wrap persist calls in try/catch and log exceptions --- .../UserSettings/UserSettingsHub.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs b/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs index be09f4632..3ebab980a 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs @@ -1,4 +1,5 @@ -using mbts.spark; +using bts; +using mbts.spark; using System; using System.ComponentModel.Composition; using System.Reactive.Linq; @@ -24,7 +25,13 @@ namespace mbts.persist { _persist = persist; init(); async void init() { - var s = await _persist.get(NAME_SPACE, DEFAULT_KEY); + UserSettings s; + try { + s = await _persist.get(NAME_SPACE, DEFAULT_KEY); + } catch(Exception ex) { + Log.Persist.warn($"Error loading {typeof(UserSettings)} from namespace '{NAME_SPACE}', will restore factory defaults and continue as usual: {ex}"); + await save_default(s = UserSettings.factory_defaults); + } if (s != null) _set_and_notify(s); } @@ -43,7 +50,11 @@ namespace mbts.persist { public async Task save_default(UserSettings value) { _set_and_notify(value); - await _persist.set(NAME_SPACE, DEFAULT_KEY, value); + try { + await _persist.set(NAME_SPACE, DEFAULT_KEY, value); + } catch(Exception ex) { + Log.Persist.warn($"Error persisting {typeof(UserSettings)} in namespace '{NAME_SPACE}': {ex}"); + } } void _set_and_notify(UserSettings value) {