hyper-neptune/yuuki
1
1
Fork 0
mirror of https://github.com/hyper-neptune/yuuki.git synced 2024-09-20 12:06:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolving exit problem

Browse source
This commit is contained in:
SuperSonic 2020-02-28 18:37:54 +08:00
parent baf9bc19fb
commit 3f6eddf4b5
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/data_mds.py
View file

@ -10,6 +10,7 @@
# Initializing # Initializing
import json import json
import types
from abc import ABC from abc import ABC
from tornado.httpserver import HTTPServer from tornado.httpserver import HTTPServer
@ -43,8 +44,8 @@ class IndexHandler(RequestHandler, ABC):
) )
else: else:
result = {"status": 401} result = {"status": 401}
if not result: if isinstance(result, types.GeneratorType):
result = {"status": 500} result = {"status": 200}
self.write(json.dumps(result)) self.write(json.dumps(result))
@ -64,7 +65,7 @@ class PythonMDS:
_work["GET"] = self._query _work["GET"] = self._query
_work["SYC"] = self._sync _work["SYC"] = self._sync
_work["YLD"] = self._yuuki_limit_decrease _work["YLD"] = self._yuuki_limit_decrease
_work["EXT"] = self.mds_exit _work["EXT"] = self._shutdown
def _query(self, data): def _query(self, data):
query_data = data["path"] query_data = data["path"]
@ -107,17 +108,18 @@ class PythonMDS:
self.switch_data["LimitInfo"][data["path"]][data["userId"]] -= 1 self.switch_data["LimitInfo"][data["path"]][data["userId"]] -= 1
return {"status": 200} return {"status": 200}
def _shutdown(self, data):
if data:
pass
yield self.__mds_exit()
async def __mds_exit(self):
self.server.stop()
self.async_lock.stop()
self.async_lock.close()
def listen(self, code): def listen(self, code):
global auth_code global auth_code
auth_code = code auth_code = code
self.server.listen(2019) self.server.listen(2019)
self.async_lock.start() self.async_lock.start()
def mds_exit(self, data):
if data:
pass
self.server.stop()
yield {"status": 200}
self.server.close_all_connections()
self.async_lock.stop()
self.async_lock.close()

2
libs/yuuki.py
View file

@ -129,7 +129,7 @@ class Yuuki:
while self.data.getData(["Global", "Power"]): while self.data.getData(["Global", "Power"]):
self.data.updateData(["Global", "Power"], False) self.data.updateData(["Global", "Power"], False)
if self.Threading: if self.Threading:
# mds_exit() self.data.mdsShake("EXT", None, None)
if self.YuukiConfigs.get("WebAdmin"): if self.YuukiConfigs.get("WebAdmin"):
self.webAdmin.stop() self.webAdmin.stop()
if restart: if restart: