diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-02-04 02:45:21 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-02-04 02:48:59 +0200 |
| commit | 68ad0ca57a74f0c4fa038384215b2e307625db00 (patch) | |
| tree | c109716c233ce96b4489d24b1c2a410a484809f3 /src/server/rz_server_ctrl.py | |
| parent | 3b87e96b0e9413b3441d4202a84271ed930beb15 (diff) | |
make_response__http__pre_tag_wrapped()
Diffstat (limited to 'src/server/rz_server_ctrl.py')
| -rw-r--r-- | src/server/rz_server_ctrl.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/rz_server_ctrl.py b/src/server/rz_server_ctrl.py index c57aff9a..e9344fa4 100644 --- a/src/server/rz_server_ctrl.py +++ b/src/server/rz_server_ctrl.py @@ -4,25 +4,25 @@ Server control/monitoring logic from datetime import datetime from flask import current_app +from rz_req_handling import make_response__http__pre_tag_wrapped def monitor__server_info(): """ server monitor stub """ dt = datetime.now() - resp_arr = ["<html><body>", - "<h1>Rhizi Server v0.1</h1><p>", - "date: " + dt.strftime("%Y-%m-%d") + "<br>", - "time: " + dt.strftime("%H:%M:%S") + "<br>", - "</p></body></html>"] - return (''.join(resp_arr), 200) + body_line_arr = ['Rhizi Server v0.1', + 'date: ' + dt.strftime('%Y-%m-%d'), + 'time: ' + dt.strftime('%H:%M:%S') + ] + return make_response__http__pre_tag_wrapped('\n'.join(body_line_arr)) def rest__list_users(): - ret_body = [] + body_line_arr = [] 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 ('<pre>' + '\n'.join(ret_body) + '</pre>') + body_line_arr.append(' '.join(ret_line)) + return make_response__http__pre_tag_wrapped('\n'.join(body_line_arr)) |