remove unnecessary list/objects

bumper/confserver.py

@@ -117,6 +117,7 @@ class ConfServer:
         #    print(resource)
 
     async def start_site(self, app, address="localhost", port=8080, usessl=False):
+        try:
             runner = web.AppRunner(app)
             self.runners.append(runner)
             await runner.setup()
@@ -134,6 +135,9 @@ class ConfServer:
                 site = web.TCPSite(runner, host=address, port=port)
 
             await site.start()
+        except Exception as e:
+            confserverlog.exception(f"{e}")
+            raise e
 
     async def start_server(self):
         try:
@@ -172,41 +176,31 @@ class ConfServer:
 
     async def handle_base(self, request):
         try:
-
             bots = bumper.db_get().table("bots").all()
             clients = bumper.db_get().table("clients").all()
-            helperbot_connected = bumper.mqtt_helperbot.is_connected
-            mqttserver = bumper.mqtt_server.broker
-            xmppserver = bumper.xmpp_server
             mq_sessions = []
-            for sess in mqttserver._sessions:
+            for (session, _) in bumper.mqtt_server.broker._sessions.values():
-                tmpsess = []
+                mq_sessions.append(
-                tmpsess.append(
                     {
-                        "username": mqttserver._sessions[sess][0].username,
+                        "username": session.username,
-                        "client_id": mqttserver._sessions[sess][0].client_id,
+                        "client_id": session.client_id,
-                        "state": mqttserver._sessions[sess][0].transitions.state,
+                        "state": session.transitions.state,
                     }
                 )
-
-                mq_sessions.append(tmpsess)
             all = {
                 "bots": bots,
                 "clients": clients,
-                "helperbot": {"connected": helperbot_connected},
+                "helperbot": {"connected": bumper.mqtt_helperbot.is_connected},
-                "mqtt_server": [
+                "mqtt_server": {
-                    {"state": bumper.mqtt_server.state},
+                    "state": bumper.mqtt_server.state,
-                    {
+                    "sessions": {
-                        "sessions": [
+                        "count": len(mq_sessions),
-                            {"count": len(mqttserver._sessions)},
+                        "clients": mq_sessions,
-                            {"clients": mq_sessions},
+                    }
-                        ]
                 },
-                ],
+                "xmpp_server": bumper.xmpp_server,
-                "xmpp_server": xmppserver,
             }
             resp = aiohttp_jinja2.render_template("home.jinja2", request, context=all)
-            # return web.json_response(all)
             return resp
 
         except Exception as e:

bumper/web/templates/home.jinja2

@@ -70,10 +70,10 @@
                     </div>
                 </div>
                 <div class="card-body">
-                    Status: {% if mqtt_server[0].state == "started" %}
+                    Status: {% if mqtt_server.state == "started" %}
-                    <span class="badge badge-success">{{ mqtt_server[0].state }}</span> {% else %}
+                    <span class="badge badge-success">{{ mqtt_server.state }}</span> {% else %}
-                    <span class="badge badge-danger">{{ mqtt_server[0].state }}</span> {% endif %}
+                    <span class="badge badge-danger">{{ mqtt_server.state }}</span> {% endif %}
-                    Sessions: {{ mqtt_server[1].sessions[0].count }}
+                    Sessions: {{ mqtt_server.sessions.count }}
 
                     <table class="table table-striped table-bordered table-responsive-lg">
                         <thead class="thead-dark">
@@ -83,12 +83,12 @@
                             <th>state</th>
                         </tr>
                         </thead>
-                        {% for sess in mqtt_server[1].sessions[1].clients %}
+                        {% for sess in mqtt_server.sessions.clients %}
                             <tr>
-                                <td>{{ sess[0].username }}</td>
+                                <td>{{ sess.username }}</td>
-                                <td>{{ sess[0].client_id }}</td>
+                                <td>{{ sess.client_id }}</td>
-                                <td {% if sess[0].state == "connected" %}
+                                <td {% if sess.state == "connected" %}
-                                    class="table-success" {% endif %}> {{ sess[0].state }} </td>
+                                    class="table-success" {% endif %}> {{ sess.state }} </td>
                             </tr>
                         {% endfor %}
                     </table>