X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fcore.py;h=8e075b0a28ace0a7078ee87b98083d4c38454c50;hb=279a3160534cad04c64c0d0b17f437c08ebb2703;hp=7decbb242d84dab536037ae7ade66229345434cc;hpb=cd78ebfec21926f231f7b5f1430d31baee4b60c4;p=mpd-sima.git

diff --git a/sima/core.py b/sima/core.py
index 7decbb2..8e075b0 100644
--- a/sima/core.py
+++ b/sima/core.py
@@ -2,11 +2,6 @@
 """Core Object dealing with plugins and player client
 """
 
-__version__ = '0.12.0.b'
-__author__ = 'kaliko jack'
-__url__ = 'git://git.kaliko.me/sima.git'
-
-import random
 import sys
 import time
 
@@ -17,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
@@ -28,6 +24,7 @@ class Sima(Daemon):
         self.enabled = True
         self.config = conf
         self.sdb = SimaDB(db_path=conf.get('sima', 'db_file'))
+        PlayerClient.database = self.sdb
         self.log = getLogger('sima')
         self.plugins = list()
         self.player = self.__get_player()  # Player client
@@ -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
         """
@@ -115,7 +119,6 @@ class Sima(Daemon):
         self.log.info('The way is shut, it was made by those who are dead. '
                       'And the dead keep it…')
         self.log.info('bye...')
-        sys.exit(0)
 
     def run(self):
         """
@@ -132,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