queue-table: Outbound › Queue as the drawn table, Inbound › Queue built
Owner, 2026-10-18: "Фиаско, что очередь не была сделана. Как мы это допустили? Исправляем!" The mockups out-queue and in-queue (design629de5e, guards8525e8e). - postfix: postqueue -j gives each message's size and each recipient's delay_reason (src/postqueue/showq_json.c, format_json(): "delay_reason" only when LEN(why) > 0); QueueListing reads it with the page's 5 s, QueueMessages keeps the notifier's 30 s. - view: one Queue page type for both directions (queue.go), one polled box (queue_body.html): a row per recipient, oldest first, cut at 200 with a foot; the head "N messages · size", "Refreshes on its own" while empty; Last reply is the delay reason, or where the message is (active, hold, incoming) before there was one. Inbound has no Details: an inbound message has no page of its own. - handlers: one read of the queue, split by the recipient's domain against the inbound domains; an outbound recipient is linked to its send-log row (store.SendLogRefsByQueueID, through idx_send_log_queue_id, plan pinned in TestSendLogQueriesUseTheirIndexes), matched without regard to case, else the message's first row. Both pages are the global role's; the inbound one 404s with the relay off. Routes /inbound/queue (+ /fragment), menu, touch menu and sibling strip. - Overview: Queues · Both empty · outbound and inbound with the relay on. - Help: the queue topic rewritten, an Inbound queue topic (word for word with the mockup; domain administrators do not see it, as with the lists). - TestUnbuiltScreensAreOnTheRoadmap and its rule in development.md: an exempted screen must be named in roadmap.md; queue-table leaves the roadmap; guide, architecture, panel-redesign.md updated. Tests: go vet; go test ./internal/web/... ./internal/store ./internal/postfix ./internal/notify pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -447,7 +447,15 @@ func healthCards(c healthReadings) []view.HealthCard {
|
||||
certValue = fmt.Sprintf("Expires in %d days", cert.DaysLeft)
|
||||
}
|
||||
|
||||
queueValue := queueCardValue(c.QueueSummary)
|
||||
// One Postfix queue, split into two pages when the inbound relay is on
|
||||
// (mockup overview: "Queues · Both empty · outbound and inbound").
|
||||
queueName, queueValue, queueSub := "Queue", queueCardValue(c.QueueSummary), "outbound"
|
||||
if c.Inbound {
|
||||
queueName, queueSub = "Queues", "outbound and inbound"
|
||||
if queueValue == "Empty" {
|
||||
queueValue = "Both empty"
|
||||
}
|
||||
}
|
||||
if e := c.QueueError; e != "" {
|
||||
queueValue = "Could not be read"
|
||||
}
|
||||
@@ -492,7 +500,7 @@ func healthCards(c healthReadings) []view.HealthCard {
|
||||
card("Machine", "ti-cpu", "/server/health", machine.Status, cpu, ram),
|
||||
card("Processes", "ti-server-cog", "/server/health", c.ProcessStatus, procValue, procSub),
|
||||
card("TLS certificate", "ti-certificate", "/server/health", cert.Status, certValue, cert.Subject),
|
||||
card("Queue", "ti-stack-2", "/outbound/queue", c.QueueStatus, queueValue, "outbound"),
|
||||
card(queueName, "ti-stack-2", "/outbound/queue", c.QueueStatus, queueValue, queueSub),
|
||||
card("Milter sockets", "ti-plug-connected", "/server/health", c.SocketStatus,
|
||||
fmt.Sprintf("%d of %d answering", answering, len(sockets)), socketSub),
|
||||
card("Reverse DNS", "ti-arrows-exchange", "/server/health", ptr.Status, ptrValue, c.Hostname),
|
||||
@@ -539,12 +547,15 @@ type healthReadings struct {
|
||||
QueueSummary string
|
||||
QueueError string
|
||||
QueueStatus health.Status
|
||||
Machine health.Machine
|
||||
Cert health.Certificate
|
||||
Sockets []health.Socket
|
||||
SocketStatus health.Status
|
||||
Hostname string
|
||||
PTR dnscheck.Result
|
||||
// Inbound is the relay on port 25: Postfix's one queue then holds mail of
|
||||
// both directions, and the Queues card says so.
|
||||
Inbound bool
|
||||
Machine health.Machine
|
||||
Cert health.Certificate
|
||||
Sockets []health.Socket
|
||||
SocketStatus health.Status
|
||||
Hostname string
|
||||
PTR dnscheck.Result
|
||||
// Banner is Postfix's smtpd_banner, expanded: the greeting after "220".
|
||||
Banner string
|
||||
}
|
||||
@@ -597,6 +608,7 @@ func (h *Handlers) healthChecks() healthReadings {
|
||||
QueueSummary: queueSummary(queueText),
|
||||
QueueError: queueErr,
|
||||
QueueStatus: queueStatus,
|
||||
Inbound: h.cfg.InboundEnabled,
|
||||
Machine: machine,
|
||||
Cert: cert,
|
||||
Sockets: sockets,
|
||||
|
||||
Reference in New Issue
Block a user