Procházet zdrojové kódy

using blinker signals now, added global-exit signal, connected gpio.cleanup to global-exit, added cleanup funk to FakeGPIO

digital před 7 roky
rodič
revize
8a1d041d90
2 změnil soubory, kde provedl 45 přidání a 5 odebrání
  1. 2 0
      lib/beewatch/server/__init__.py
  2. 43 5
      server.py

+ 2 - 0
lib/beewatch/server/__init__.py

@@ -17,6 +17,7 @@
 # along with BeeWatch.  If not, see <http://www.gnu.org/licenses/>.
 
 import curio
+import blinker
 import logging
 import logging.handlers
 import digilib.network
@@ -52,6 +53,7 @@ class BeeWatchServer(digilib.network.Server):
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         return s
 
+
 class ConnHandlerBeeWatch(digilib.network.ConnHandlerBase):
     def __init__(self, socket, addr, server):
         super(ConnHandlerBeeWatch, self).__init__(socket, addr, server)

+ 43 - 5
server.py

@@ -18,6 +18,7 @@
 #
 
 import argparse
+import blinker
 import gi
 gi.require_version('Notify', '0.7')
 from gi.repository import Notify
@@ -38,6 +39,9 @@ import beewatch.server
 # import beewatch.server as beeserver
 import digilib.misc
 
+
+Notify.init("Bee Watch Server")
+
 log = logging.getLogger(__name__+"")
 
 parser = argparse.ArgumentParser(
@@ -119,6 +123,8 @@ bee_server = beewatch.server.BeeWatchServer(
     log_ip=args.log_ip,
 )
 
+sig_exit = blinker.signal("global-exit")
+
 try:
     bee_server.run()
 except Exception as e:
@@ -128,14 +134,46 @@ except KeyboardInterrupt:
     print("\r    ", end="\r")
     logging.warn("KeyboardInterrupt! aborting!")
 finally:
-    # bee_server.stop()
+    sig_exit.send()
     pass
 
 
-
 sys.exit()
 
-log = logging.getLogger(__name__+".server")
-logc = logging.getLogger(__name__+".chat")
 
-Notify.init("Bee Watch Server")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#