Add more info in crash report (Closes #56)

[mpd-sima.git] / sima / core.py

diff --git a/sima/core.py b/sima/core.py
index f4154d9d9f60c68c4812d189d72cb231df1788f6..7f3631cfb610c03346218c032da5d95e9ce143ad 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -26,7 +26,7 @@ from collections import deque
 from logging import getLogger
 
 from .mpdclient import MPD as PlayerClient
-from .mpdclient import PlayerError, MPDError
+from .mpdclient import PlayerError
 from .lib.simadb import SimaDB
 from .lib.daemon import Daemon
 from .utils.utils import SigHup
@@ -46,7 +46,7 @@ class Sima(Daemon):
         self.log = getLogger('sima')
         self._plugins = list()
         self._core_plugins = list()
-        self.player = PlayerClient(self)  # Player client
+        self.player = PlayerClient(conf)  # MPD client
         self.short_history = deque(maxlen=60)
 
     def add_history(self):
@@ -125,7 +125,7 @@ class Sima(Daemon):
             except PlayerError as err:
                 self.log.debug(err)
                 continue
-            except MPDError as err:
+            except PlayerError as err:
                 #TODO: unhandled Player exceptions
                 self.log.warning('Unhandled player exception: %s', err)
             self.log.info('Got reconnected')
@@ -160,13 +160,13 @@ class Sima(Daemon):
             self.log.info('Connecting MPD: %(host)s:%(port)s', self.config['MPD'])
             self.player.connect()
             self.foreach_plugin('start')
-        except (PlayerError, MPDError) as err:
+        except PlayerError as err:
             self.log.warning('Player: %s', err)
             self.reconnect_player()
         while 42:
             try:
                 self.loop()
-            except (PlayerError, MPDError) as err:
+            except PlayerError as err:
                 self.log.warning('Player error: %s', err)
                 self.reconnect_player()
                 del self.changed