viewer2: Show git hash and uptime

Author: chfoo

viewer2/Cargo.lock

@@ -3,6 +3,7 @@ name = "archivebot-viewer"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80"
 
 [dependencies]
 anyhow = "1.0.71"
@@ -12,6 +13,7 @@ axum = "0.7.5"
 chrono = { version = "0.4.26", features = ["serde"] }
 clap = { version = "4.3.5", features = ["derive"] }
 futures = "0.3.28"
+git-version = "0.3.9"
 idna = "1.0.2"
 lazy_static = "1.4.0"
 percent-encoding = "2.3.0"

viewer2/Cargo.toml

@@ -3,13 +3,15 @@ mod database;
 mod ia;
 mod web;
 
-use std::{fmt::Display, net::IpAddr, path::PathBuf, process::ExitCode, time::Duration};
+use std::{fmt::Display, net::IpAddr, path::PathBuf, process::ExitCode, sync::LazyLock, time::{Duration, Instant}};
 
 use clap::Parser;
 use tokio_util::sync::CancellationToken;
 use tracing::Level;
 use tracing_subscriber::prelude::*;
 
+static START_TIME: LazyLock<Instant> = LazyLock::new(Instant::now);
+
 #[derive(Parser, Debug)]
 #[command(author, version)]
 struct Args {
@@ -78,6 +80,8 @@ async fn main() -> ExitCode {
 }
 
 async fn main_inner() -> anyhow::Result<()> {
+    let _ = *START_TIME;
+
     let args = Args::parse();
 
     init_logging();

viewer2/src/main.rs

@@ -11,8 +11,9 @@ use chrono::{DateTime, Datelike, NaiveDate, Utc};
 use serde::Deserialize;
 use tokio::net::TcpListener;
 
-use crate::backend::{
-    AuditItem, Backend, CostRow, DomainRow, ItemRow, JobRow, JobsRow, SearchResult,
+use crate::{
+    backend::{AuditItem, Backend, CostRow, DomainRow, ItemRow, JobRow, JobsRow, SearchResult},
+    START_TIME,
 };
 
 const PAGE_LIMIT: i64 = 1000;
@@ -130,6 +131,8 @@ struct IndexTemplate {
     query: String,
     search_results: Vec<SearchResult>,
     last_update: DateTime<Utc>,
+    git_hash: &'static str,
+    uptime: (u32, u8, u8, u8), // (days, hours, minutes, seconds)
 }
 
 async fn index_handler(
@@ -146,11 +149,19 @@ async fn index_handler(
     };
     let last_update = state.backend.get_last_update().await?;
 
+    let uptime = START_TIME.elapsed();
+    let uptime_sec = (uptime.as_secs() % 60) as u8;
+    let uptime_min = (uptime.as_secs() / 60 % 60) as u8;
+    let uptime_hour = (uptime.as_secs() / 3600 % 60) as u8;
+    let uptime_day = (uptime.as_secs() / 86400) as u32;
+
     Ok(IndexTemplate {
         link_prefix: state.link_prefix,
         query: search_params.q,
         search_results,
         last_update,
+        git_hash: git_version::git_version!(fallback = "unknown"),
+        uptime: (uptime_day, uptime_hour, uptime_min, uptime_sec),
     })
 }
 

viewer2/src/web.rs

@@ -38,5 +38,12 @@
     <a href="{{ link_prefix }}stats">Stats</a> &ndash; graphs of resource usage on Internet Archive<br>
 
     <p>Last update: {{ last_update }}</p>
+    <details>
+        <summary>Debug info</summary>
+        <ul>
+            <li>Git commit hash: {{ git_hash }}</li>
+            <li>Executable uptime: {{ uptime.0 }}d {{ uptime.1 }}h {{ uptime.2 }}m {{ uptime.3 }}s</li>
+        </ul>
+    </details>
     <p>Attention: Please <a href="{{ link_prefix }}faq">read this</a> to learn how this index works.</p>
 {% endblock %}