修复 windows 下 signal.SIGHUP 错误
This commit is contained in:
@@ -33,11 +33,11 @@ class App:
|
|||||||
@classmethod
|
@classmethod
|
||||||
def run(cls):
|
def run(cls):
|
||||||
self = cls()
|
self = cls()
|
||||||
|
self.register_sign()
|
||||||
self.start()
|
self.start()
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
Config().run()
|
Config().run()
|
||||||
for sign in [signal.SIGINT, signal.SIGHUP, signal.SIGTERM]: signal.signal(sign, self.handler_exit)
|
|
||||||
self.init_class()
|
self.init_class()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -54,6 +54,15 @@ class App:
|
|||||||
if Config.is_cluster_enabled():
|
if Config.is_cluster_enabled():
|
||||||
Cluster().run()
|
Cluster().run()
|
||||||
|
|
||||||
|
def register_sign(self):
|
||||||
|
is_windows = os.name == 'nt'
|
||||||
|
signs = [signal.SIGINT, signal.SIGHUP, signal.SIGTERM]
|
||||||
|
if is_windows:
|
||||||
|
signs = [signal.SIGINT, signal.SIGTERM]
|
||||||
|
for sign in signs:
|
||||||
|
signal.signal(sign, self.handler_exit)
|
||||||
|
|
||||||
|
pass
|
||||||
def handler_exit(self, *args, **kwargs):
|
def handler_exit(self, *args, **kwargs):
|
||||||
"""
|
"""
|
||||||
程序退出
|
程序退出
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ class UserJob:
|
|||||||
UserLog.add_quick_log(message).flush()
|
UserLog.add_quick_log(message).flush()
|
||||||
else:
|
else:
|
||||||
self.cluster.publish_log_message(message)
|
self.cluster.publish_log_message(message)
|
||||||
self.set_last_heartbeat()
|
# self.set_last_heartbeat()
|
||||||
|
|
||||||
def get_last_heartbeat(self):
|
def get_last_heartbeat(self):
|
||||||
if Config().is_cluster_enabled():
|
if Config().is_cluster_enabled():
|
||||||
@@ -157,6 +157,7 @@ class UserJob:
|
|||||||
is_login = response.json().get('data.flag', False)
|
is_login = response.json().get('data.flag', False)
|
||||||
if is_login:
|
if is_login:
|
||||||
self.save_user()
|
self.save_user()
|
||||||
|
self.set_last_heartbeat()
|
||||||
# self.get_user_info() # 检测应该是不会维持状态,这里再请求下个人中心看有没有用,01-10 看来应该是没用
|
# self.get_user_info() # 检测应该是不会维持状态,这里再请求下个人中心看有没有用,01-10 看来应该是没用
|
||||||
|
|
||||||
return is_login
|
return is_login
|
||||||
|
|||||||
Reference in New Issue
Block a user