Avoid panics in the webserver

- Don't panic if looking at two local builds in the dashboard - Don't panic if there are no pstat results available
rust-lang · Jun 30, 2020 · a72221f · a72221f
1 parent d6e24e9
commit a72221f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/database/src/pool/sqlite.rs b/database/src/pool/sqlite.rs
@@ -331,7 +331,6 @@ impl Connection for SqliteConnection {
                         cid.and_then(|cid| {
                             query
                                 .query_row(params![&sid, &cid.0], |row| row.get(0))
-                                .optional()
                                 .unwrap_or_else(|e| {
                                     panic!("{:?}: series={:?}, aid={:?}", e, sid, cid);
                                 })

diff --git a/site/src/server.rs b/site/src/server.rs
@@ -109,14 +109,18 @@ pub async fn handle_dashboard(data: Arc<InputData>) -> ServerResult<dashboard::R
         ) {
             (Some(a), Some(b)) => a.cmp(&b),
             (_, _) => {
+                use std::cmp::Ordering;
+
                 if a.starts_with("beta") && b.starts_with("beta") {
                     a.cmp(b)
                 } else if a.starts_with("beta") {
-                    std::cmp::Ordering::Greater
+                    Ordering::Greater
                 } else if b.starts_with("beta") {
-                    std::cmp::Ordering::Less
+                    Ordering::Less
                 } else {
-                    panic!("unexpected version")
+                    // These are both local ids, not a commit.
+                    // There's no way to tell which version they are, so just pretend they're the same.
+                    Ordering::Equal
                 }
             }
         }