mirror of
https://git.sr.ht/~tsileo/microblog.pub
synced 2024-12-22 21:24:28 +00:00
Add outgoing activity logs to stats
This commit is contained in:
parent
758a28d0e1
commit
8833b5b371
1 changed files with 56 additions and 6 deletions
|
@ -6,6 +6,7 @@ from sqlalchemy import case
|
||||||
from sqlalchemy import func
|
from sqlalchemy import func
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import joinedload
|
||||||
from tabulate import tabulate
|
from tabulate import tabulate
|
||||||
|
|
||||||
from app import models
|
from app import models
|
||||||
|
@ -94,7 +95,12 @@ async def get_outgoing_activity_stats(
|
||||||
).where(f)
|
).where(f)
|
||||||
)
|
)
|
||||||
).one()
|
).one()
|
||||||
return OutgoingActivityStatsItem(**dict(row))
|
return OutgoingActivityStatsItem(
|
||||||
|
total_count=row.total_count or 0,
|
||||||
|
waiting_count=row.waiting_count or 0,
|
||||||
|
sent_count=row.sent_count or 0,
|
||||||
|
errored_count=row.errored_count or 0,
|
||||||
|
)
|
||||||
|
|
||||||
from_inbox = await _get_stats(models.OutgoingActivity.inbox_object_id.is_not(None))
|
from_inbox = await _get_stats(models.OutgoingActivity.inbox_object_id.is_not(None))
|
||||||
from_outbox = await _get_stats(
|
from_outbox = await _get_stats(
|
||||||
|
@ -115,12 +121,28 @@ async def get_outgoing_activity_stats(
|
||||||
|
|
||||||
def print_stats() -> None:
|
def print_stats() -> None:
|
||||||
async def _get_stats():
|
async def _get_stats():
|
||||||
async with async_session() as session:
|
async with async_session() as db_session:
|
||||||
dat = await get_outgoing_activity_stats(session)
|
outgoing_activity_stats = await get_outgoing_activity_stats(db_session)
|
||||||
|
|
||||||
return dat
|
outgoing_activities = (
|
||||||
|
(
|
||||||
|
await db_session.scalars(
|
||||||
|
select(models.OutgoingActivity)
|
||||||
|
.options(
|
||||||
|
joinedload(models.OutgoingActivity.inbox_object),
|
||||||
|
joinedload(models.OutgoingActivity.outbox_object),
|
||||||
|
)
|
||||||
|
.order_by(models.OutgoingActivity.last_try.desc())
|
||||||
|
.limit(10)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.unique()
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
||||||
outgoing_activity_stats = asyncio.run(_get_stats())
|
return outgoing_activity_stats, outgoing_activities
|
||||||
|
|
||||||
|
outgoing_activity_stats, outgoing_activities = asyncio.run(_get_stats())
|
||||||
disk_usage_stats = get_disk_usage_stats()
|
disk_usage_stats = get_disk_usage_stats()
|
||||||
|
|
||||||
print()
|
print()
|
||||||
|
@ -139,7 +161,6 @@ def print_stats() -> None:
|
||||||
headers=["Disk usage", "size"],
|
headers=["Disk usage", "size"],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
print()
|
print()
|
||||||
print(
|
print(
|
||||||
tabulate(
|
tabulate(
|
||||||
|
@ -155,3 +176,32 @@ def print_stats() -> None:
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
print()
|
print()
|
||||||
|
print("Outgoing activities log")
|
||||||
|
print("=======================")
|
||||||
|
print()
|
||||||
|
print(
|
||||||
|
tabulate(
|
||||||
|
[
|
||||||
|
(
|
||||||
|
row.anybox_object.ap_id,
|
||||||
|
humanize.naturaltime(row.last_try),
|
||||||
|
row.recipient,
|
||||||
|
row.tries,
|
||||||
|
row.last_status_code,
|
||||||
|
row.is_sent,
|
||||||
|
row.is_errored,
|
||||||
|
)
|
||||||
|
for row in outgoing_activities
|
||||||
|
],
|
||||||
|
headers=[
|
||||||
|
"Object",
|
||||||
|
"last try",
|
||||||
|
"recipient",
|
||||||
|
"tries",
|
||||||
|
"status code",
|
||||||
|
"sent",
|
||||||
|
"errored",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print()
|
||||||
|
|
Loading…
Reference in a new issue