From aaed5aa94d207cdbc94259ded5d416ef6dccf12a Mon Sep 17 00:00:00 2001 From: imlonghao Date: Sun, 23 Jan 2022 17:22:56 +0800 Subject: [PATCH] fix: fixed the decimal places for memory field --- CHANGELOG.md | 1 + html/logs.html | 5 ++++- src/main.rs | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8778d35..32334b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove the quote tag from more href - Remove the word `率` in memory field - Prevent A link being wrap +- Fixed the decimal places for memory field ## [0.2.1] - 2022-01-23 diff --git a/html/logs.html b/html/logs.html index 7af9110..b14f0ae 100644 --- a/html/logs.html +++ b/html/logs.html @@ -83,7 +83,10 @@ { targets: 6, title: "内存使用（GiB）", - data: "memory" + data: "memory", + render: function (data, type, row, meta) { + return data.toFixed(3) + } }, { targets: 7, diff --git a/src/main.rs b/src/main.rs index 8fbec7a..16d024b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -149,7 +149,7 @@ async fn logs(db: web::Data) -> impl Responder { let conn = db.get().await.unwrap(); let rows = conn .query( - "select ts, pkgbase, COALESCE(pkg_version, '') AS pkg_version, elapsed, result, COALESCE(case when elapsed = 0 then 0 else cputime * 100 / elapsed end, -1) AS cpu, COALESCE(round(memory / 1073741824.0, 3), -1) AS memory from ( + "select ts, pkgbase, COALESCE(pkg_version, '') AS pkg_version, elapsed, result, COALESCE(case when elapsed = 0 then 0 else cputime * 100 / elapsed end, -1) AS cpu, COALESCE(memory / 1073741824.0, -1) AS memory from ( select *, row_number() over (partition by pkgbase order by ts desc) as k from lilac.pkglog ) as w where k = 1 order by ts desc", @@ -190,7 +190,7 @@ async fn get_pkg( let conn = db.get().await.unwrap(); let rows = conn .query( - "select ts, pkgbase, COALESCE(pkg_version, '') AS pkg_version, elapsed, result, COALESCE(case when elapsed = 0 then 0 else cputime * 100 / elapsed end, -1) AS cpu, COALESCE(round(memory / 1073741824.0, 3), -1) AS memory from lilac.pkglog WHERE pkgbase=$1 order by id desc", + "select ts, pkgbase, COALESCE(pkg_version, '') AS pkg_version, elapsed, result, COALESCE(case when elapsed = 0 then 0 else cputime * 100 / elapsed end, -1) AS cpu, COALESCE(memory / 1073741824.0, -1) AS memory from lilac.pkglog WHERE pkgbase=$1 order by id desc", &[&name.to_string()], ) .await