From d91c3f68b5aa11e207a71dae3cc3272be8a965c5 Mon Sep 17 00:00:00 2001 From: v Date: Thu, 28 Jan 2021 19:38:53 +0000 Subject: [PATCH] Added HTTP 418 support --- src/onstat.nim | 16 ++++++++++------ src/style.css | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/onstat.nim b/src/onstat.nim index 5ec2e01..8a5b4d9 100644 --- a/src/onstat.nim +++ b/src/onstat.nim @@ -37,8 +37,9 @@ type ResponseType = enum rtOk = 0 rtHttpError = 1 - rtTimeout = 2 - rtFetchError = 3 + rtHttpTeapot = 2 + rtTimeout = 3 + rtFetchError = 4 Response = object rtype: ResponseType latency: int64 # microseconds @@ -50,7 +51,7 @@ type uptimePercent: float proc uptimeSince(sid: int, time: Time): float = - let okPings = fromDbValue(get getDB().value("SELECT COUNT(*) FROM reqs WHERE site = ? AND status = 0", sid), int) + let okPings = fromDbValue(get getDB().value("SELECT COUNT(*) FROM reqs WHERE site = ? AND (status = 0 OR status = 2)", sid), int) let totalPings = fromDbValue(get getDB().value("SELECT COUNT(*) FROM reqs WHERE site = ?", sid), int) okPings / totalPings @@ -64,7 +65,7 @@ proc fetchLatest(row: ResultRow): Option[SiteStatus] = proc mainPage(): string = let sites = getDB().all("SELECT * FROM sites ORDER BY sid").map(fetchLatest).filter(x => isSome x).map(x => get x) - let up = sites.filter(x => x.lastResponse == rtOk).len() + let up = sites.filter(x => (x.lastResponse == rtOk) or (x.lastResponse == rtHttpTeapot)).len() let vnode = buildHtml(html()): head: meta(charset="utf8") @@ -81,12 +82,14 @@ proc mainPage(): string = of rtHttpError: text "⚠ " of rtTimeout: text "✕ " of rtFetchError: text "✕ " + of rtHttpTeapot: text "🫖 " text site.url tdiv: text("Last pinged " & format(site.lastPing, "HH:mm:ss dd-MM-yyyy")) tdiv: case site.lastResponse of rtOk: text &"Latency {site.lastLatency}ms" of rtHttpError: text "HTTP error" + of rtHttpTeapot: text &"Teapot, latency {site.lastLatency}ms" of rtTimeout: text "Timed out" of rtFetchError: text "Fetch failed" tdiv: text &"{site.uptimePercent * 100}% up in last week" @@ -107,7 +110,8 @@ proc pollTarget(s: string): Future[Response] {.async.} = let ts = now().utc let res = await client.get(s) let latency = (now().utc - ts).inMicroseconds - if res.code.is4xx or res.code.is5xx: x = Response(rtype: rtHttpError, latency: latency) + if res.code.int == 418: x = Response(rtype: rtHttpTeapot, latency: latency) + elif res.code.is4xx or res.code.is5xx: x = Response(rtype: rtHttpError, latency: latency) else: x = Response(rtype: rtOk, latency: latency) try: discard await withTimeout(doFetch(), 10000) @@ -129,4 +133,4 @@ echo "Starting up" asyncCheck pollTargets() addTimer(5000, false, timerCallback) var server = newAsyncHttpServer() -waitFor server.serve(Port(7800), onRequest) \ No newline at end of file +waitFor server.serve(Port(7800), onRequest) diff --git a/src/style.css b/src/style.css index 5dc5899..99f5ce8 100644 --- a/src/style.css +++ b/src/style.css @@ -26,9 +26,12 @@ h1 { .card.rtHttpError h2 { color: orange; } +.card.rtHttpTeapot h2 { + color: blue; +} .card.rtFetchError h2 { color: red; } .card.rtTimeout h2 { color: red; -} \ No newline at end of file +}