From d1f2146b59af4e7944fe155ea1e4837f07c67709 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 16 Jul 2014 10:36:46 +0200 Subject: [PATCH] mpd: Raise FrontendError instead of sys.exit(1) --- mopidy/mpd/actor.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mopidy/mpd/actor.py b/mopidy/mpd/actor.py index 684b4968..52cf6746 100644 --- a/mopidy/mpd/actor.py +++ b/mopidy/mpd/actor.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals import logging -import sys import pykka -from mopidy import zeroconf +from mopidy import exceptions, zeroconf from mopidy.core import CoreListener from mopidy.mpd import session from mopidy.utils import encoding, network, process @@ -34,10 +33,9 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener): max_connections=config['mpd']['max_connections'], timeout=config['mpd']['connection_timeout']) except IOError as error: - logger.error( - 'MPD server startup failed: %s', + raise exceptions.FrontendError( + 'MPD server startup failed: %s' % encoding.locale_decode(error)) - sys.exit(1) logger.info('MPD server running at [%s]:%s', self.hostname, self.port)