From 3b87e96b0e9413b3441d4202a84271ed930beb15 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Wed, 4 Feb 2015 02:39:04 +0200 Subject: refactor /monitor/x logic into rz_server_ctrl --- src/server/rz_api.py | 11 ----------- src/server/rz_server_ctrl.py | 28 ++++++++++++++++++++++++++++ src/server/rz_user.py | 10 ---------- 3 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 src/server/rz_server_ctrl.py (limited to 'src/server') diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 012d4826..356e79d9 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -139,17 +139,6 @@ def diff_commit__set(): op = DBO_diff_commit__topo(topo_diff) return __common_exec(op) -def monitor__server_info(): - """ - server monitor stub - """ - dt = datetime.now() - resp_arr = ["", - "

Rhizi Server v0.1

", - "date: " + dt.strftime("%Y-%m-%d") + "
", - "time: " + dt.strftime("%H:%M:%S") + "
", - "

"] - return (''.join(resp_arr), 200) def username_initials(username): """ return two letter (always) initials of username. diff --git a/src/server/rz_server_ctrl.py b/src/server/rz_server_ctrl.py new file mode 100644 index 00000000..c57aff9a --- /dev/null +++ b/src/server/rz_server_ctrl.py @@ -0,0 +1,28 @@ +""" +Server control/monitoring logic +""" + +from datetime import datetime +from flask import current_app + +def monitor__server_info(): + """ + server monitor stub + """ + dt = datetime.now() + resp_arr = ["", + "

Rhizi Server v0.1

", + "date: " + dt.strftime("%Y-%m-%d") + "
", + "time: " + dt.strftime("%H:%M:%S") + "
", + "

"] + return (''.join(resp_arr), 200) + +def rest__list_users(): + ret_body = [] + for uid, u_account in current_app.user_db: + ret_line = [] + ret_line.append('uid: %s' % (uid).ljust(16)) + for f_str in str(u_account).split(','): + ret_line.append(f_str.ljust(16)) + ret_body.append(' '.join(ret_line)) + return ('

' + '\n'.join(ret_body) + '

') diff --git a/src/server/rz_user.py b/src/server/rz_user.py index 778cc56c..534a0146 100644 --- a/src/server/rz_user.py +++ b/src/server/rz_user.py @@ -114,16 +114,6 @@ def rest__login(): if request.method == 'GET': return render_template('login.html') -def rest__list_users(): - ret_body = [] - for uid, u_account in current_app.user_db: - ret_line = [] - ret_line.append('uid: %s' % (uid).ljust(16)) - for f_str in str(u_account).split(','): - ret_line.append(f_str.ljust(16)) - ret_body.append(' '.join(ret_line)) - return ('

' + '\n'.join(ret_body) + '

') - def rest__logout(): """ REST API endpoint: logout -- cgit v1.3.1