mpd: Raise FrontendError instead of sys.exit(1)

This commit is contained in:
Stein Magnus Jodal 2014-07-16 10:36:46 +02:00
parent a1848aece5
commit d1f2146b59

View File

@ -1,11 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import logging import logging
import sys
import pykka import pykka
from mopidy import zeroconf from mopidy import exceptions, zeroconf
from mopidy.core import CoreListener from mopidy.core import CoreListener
from mopidy.mpd import session from mopidy.mpd import session
from mopidy.utils import encoding, network, process from mopidy.utils import encoding, network, process
@ -34,10 +33,9 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
max_connections=config['mpd']['max_connections'], max_connections=config['mpd']['max_connections'],
timeout=config['mpd']['connection_timeout']) timeout=config['mpd']['connection_timeout'])
except IOError as error: except IOError as error:
logger.error( raise exceptions.FrontendError(
'MPD server startup failed: %s', 'MPD server startup failed: %s' %
encoding.locale_decode(error)) encoding.locale_decode(error))
sys.exit(1)
logger.info('MPD server running at [%s]:%s', self.hostname, self.port) logger.info('MPD server running at [%s]:%s', self.hostname, self.port)