erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (xmpp): improve pluging timing log by using highest profileConnected time:

Browse source 
previously the first `profileConnected` time was used, however it may not be the highest
(if `profileConnecting` is high but not `profileConnected`).
This commit is contained in:
Goffi 2023-03-10 17:01:09 +01:00
commit 060f52c0ef
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sat/core/xmpp.py
View file

@ -297,6 +297,9 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
list_d = defer.DeferredList(conn_cb_list)
def logPluginResults(results):
if not results:
log.info("no plugin loaded")
return
all_succeed = all([success for success, result in results])
if not all_succeed:
log.error(_("Plugins initialisation error"))
@ -304,12 +307,13 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
if not success:
plugin_name = plugin_conn_cb[idx][0]._info["import_name"]
log.error(f"error (plugin {plugin_name}): {result}")
log.debug(f"Plugin loading time for {profile!r} (longer to shorter):\n")
plugins_by_timer = sorted(
connection_timer,
key=lambda p: connection_timer[p]["total"],
reverse=True
)
log.debug(f"Plugin loading time for {profile!r} (longer to shorter):\n")
# total is the addition of all connecting and connected, doesn't really
# reflect the real loading time as connected are launched in a
# DeferredList
@ -318,7 +322,7 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
# longuest connected (connected happen in parallel, thus the longuest is
# roughly the total time for connected)
total_real = 0
total_real_first_connected = False
total_real = max(t.get("connected", 0) for t in connection_timer.values())
for plugin in plugins_by_timer:
name = plugin._info["import_name"]
@ -334,10 +338,6 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
connected = f"{timer['connected']:.2f}s"
except KeyError:
connected = "n/a"
else:
if not total_real_first_connected:
total_real += timer['connected']
total_real_first_connected = True
log.debug(
f" - {name}: total={timer['total']:.2f}s "
f"connecting={connecting} connected={connected}"