jiazhizhong/py12306
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加集群状态支持

Browse Source
This commit is contained in:
Jalin
2019-01-14 16:06:27 +08:00
parent 26d0f5a1de
commit 550c87d77a
9 changed files with 82 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
py12306/web/handler/stat.py
View File

@@ -27,3 +27,25 @@ def dashboard():
'user_job_count': user_job_count,
'query_count': query_count
})
@stat.route('/stat/cluster', methods=['GET'])
@jwt_required
def clusters():
"""
节点统计
节点数量，主节点，子节点列表
:return:
"""
from py12306.cluster.cluster import Cluster
nodes = Cluster().nodes
count = len(nodes)
node_lists = list(nodes)
master = [key for key, val in nodes.items() if int(val) == Cluster.KEY_MASTER]
master = master[0] if master else ''
return jsonify({
'master': master,
'count': count,
'node_lists': ', '.join(node_lists)
})

4
py12306/web/handler/user.py
View File

@@ -49,6 +49,7 @@ def user_info():
}
return jsonify(result)
def convert_job_to_info(job: UserJob):
return {
'key': job.key,
@@ -56,5 +57,6 @@ def convert_job_to_info(job: UserJob):
'name': job.get_name(),
'is_ready': job.is_ready,
'is_loaded': job.user_loaded, # 是否成功加载 ready 是当前是否可用
'last_heartbeat': timestamp_to_time(job.last_heartbeat)
'last_heartbeat': timestamp_to_time(job.last_heartbeat),
'login_num': job.login_num
}

15
py12306/web/static/css/app.35e2fbd94557d71d1e2bfa0d4bb44d13.css Normal file
View File

File diff suppressed because one or more lines are too long

6
py12306/web/static/index.html
View File

@@ -1,3 +1,3 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>py12306 购票助手</title><link href=../../static/css/app.dfb5ffed622907edd7c5f81709f2b782.css rel=stylesheet></head><body><script>window.config = {
API_BASE_URL: 'http://localhost:8080/',
}</script><div id=app></div><script type=text/javascript src=../../static/js/manifest.82f431004cf9bb6ad2cb.js></script><script type=text/javascript src=../../static/js/vendor.aebd1de04bf90e88d9c7.js></script><script type=text/javascript src=../../static/js/app.96ef02c9e5601eb5ebcb.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>py12306 购票助手</title><link href=../../static/css/app.35e2fbd94557d71d1e2bfa0d4bb44d13.css rel=stylesheet></head><body><script>window.config = {
API_BASE_URL: 'http://localhost:8008/',
}</script><div id=app></div><script type=text/javascript src=../../static/js/manifest.82f431004cf9bb6ad2cb.js></script><script type=text/javascript src=../../static/js/vendor.aebd1de04bf90e88d9c7.js></script><script type=text/javascript src=../../static/js/app.7d7d65cccfbfa339beba.js></script></body></html>

1
py12306/web/static/js/app.7d7d65cccfbfa339beba.js Normal file
View File

File diff suppressed because one or more lines are too long