2 files changed, 20 insertions, 9 deletions
diff --git a/src/server/rz_req_handling.py b/src/server/rz_req_handling.py
index 9d3e0b44..53344170 100644
--- a/src/server/rz_req_handling.py
+++ b/src/server/rz_req_handling.py
@@ -22,6 +22,17 @@ def make_response__http__empty(status=200):
     resp.status = str(status)
     return resp
 
+def make_response__http__pre_tag_wrapped(html_str, status=200):
+    """
+    Construct a '<pre>' tag wrapped HTTP response
+    """
+    resp_arr = ['<!DOCTYPE html>',
+                '<html><body><pre>',
+                html_str,
+                '</pre></body></html>'
+                ]
+    return (''.join(resp_arr), 200)
+
 def make_response__json__html(status=200, html_str=''):
     """
     Construct a json response with HTML payload
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))