X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=8e075b0a28ace0a7078ee87b98083d4c38454c50;hb=deb847c3dbc3bec518f4edd414039098c8d04f3e;hp=f535a33d486e6e11e577cfffac75877b3ff37144;hpb=57621c64288a742232b379b53bfe5fce34959535;p=mpd-sima.git diff --git a/sima/core.py b/sima/core.py index f535a33..8e075b0 100644 --- a/sima/core.py +++ b/sima/core.py @@ -2,10 +2,6 @@ """Core Object dealing with plugins and player client """ -__version__ = '0.12.0pr1' -__author__ = 'kaliko jack' -__url__ = 'git://git.kaliko.me/sima.git' - import sys import time @@ -16,6 +12,7 @@ from .client import PlayerClient from .client import PlayerError, PlayerUnHandledError from .lib.simadb import SimaDB from .lib.daemon import Daemon +from .utils.utils import SigHup class Sima(Daemon): """Main class, plugin and player management @@ -36,6 +33,7 @@ class Sima(Daemon): except (PlayerError, PlayerUnHandledError) as err: self.log.error('Fails to connect player: {}'.format(err)) self.shutdown() + sys.exit(1) self.short_history = deque(maxlen=60) def __get_player(self): @@ -105,6 +103,12 @@ class Sima(Daemon): self.log.info('Got reconnected') break + def hup_handler(self, signum, frame): + self.log.warning('Caught a sighup!') + self.player.disconnect() + self.foreach_plugin('shutdown') + raise SigHup('SIGHUP caught!') + def shutdown(self): """General shutdown method """ @@ -131,6 +135,7 @@ class Sima(Daemon): except PlayerError as err: self.log.warning('Player error: %s' % err) self.reconnect_player() + del(self.changed) def loop(self): """Dispatching callbacks to plugins