From c98d2f9a9796d7dcf063a7baae2b7b3b457a3c4c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 20 Mar 2010 12:22:47 +0100 Subject: [PATCH] Exit on MPD server startup errors --- mopidy/mpd/server.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mopidy/mpd/server.py b/mopidy/mpd/server.py index fd5b5fb3..e9265ece 100644 --- a/mopidy/mpd/server.py +++ b/mopidy/mpd/server.py @@ -28,13 +28,16 @@ class MpdServer(asyncore.dispatcher): def __init__(self, core_queue): asyncore.dispatcher.__init__(self) - self.core_queue = core_queue - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - self.set_reuse_addr() - self.bind((settings.SERVER_HOSTNAME, settings.SERVER_PORT)) - self.listen(1) - logger.info(u'MPD server running at [%s]:%s', - settings.SERVER_HOSTNAME, settings.SERVER_PORT) + try: + self.core_queue = core_queue + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + self.set_reuse_addr() + self.bind((settings.SERVER_HOSTNAME, settings.SERVER_PORT)) + self.listen(1) + logger.info(u'MPD server running at [%s]:%s', + settings.SERVER_HOSTNAME, settings.SERVER_PORT) + except IOError, e: + sys.exit('MPD server startup failed: %s' % e) def handle_accept(self): (client_socket, client_address) = self.accept()