From 61059e761049dec719af5eb68c9d11d94c449515 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 17 Aug 2010 02:02:52 +0200 Subject: [PATCH] Use logging for settings validation errors --- mopidy/utils/settings.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index 78982e8a..b478e67e 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -6,6 +6,9 @@ import os import sys from mopidy import SettingsError +from mopidy.utils import indent + +logger = logging.getLogger('mopidy.utils.settings') class SettingsProxy(object): def __init__(self, default_settings_module): @@ -43,15 +46,17 @@ class SettingsProxy(object): def validate(self): if self.get_errors(): - sys.exit(self.get_errors_as_string()) + logger.error(u'Settings validation errors: %s', + indent(self.get_errors_as_string())) + raise SettingsError(u'Settings validation failed.') def get_errors(self): return validate_settings(self.default_settings, self.local_settings) def get_errors_as_string(self): - lines = [u'Errors:'] + lines = [] for (setting, error) in self.get_errors().iteritems(): - lines.append(u' %s: %s' % (setting, error)) + lines.append(u'%s: %s' % (setting, error)) return '\n'.join(lines)