Improve Database server has terminated error msg, fix windows build

Author: kpcyrd

src/db/channel.rs

@@ -5,6 +5,7 @@ use crate::signed::Signed;
 use crate::sync;
 use async_trait::async_trait;
 use sequoia_openpgp::Fingerprint;
+use std::convert::Infallible;
 use tokio::sync::mpsc;
 
 pub enum Query {
@@ -32,7 +33,7 @@ impl DatabaseServer {
         (server, client)
     }
 
-    pub async fn run(&mut self) -> Result<()> {
+    pub async fn run(&mut self) -> Result<Infallible> {
         while let Some(msg) = self.rx.recv().await {
             match msg {
                 Query::AddRelease(fp, signed, tx) => {
@@ -57,7 +58,7 @@ impl DatabaseServer {
                 }
             }
         }
-        Ok(())
+        bail!("Database channel has been closed")
     }
 }
 

src/plumbing/mod.rs

@@ -4,7 +4,7 @@ pub mod update;
 
 use crate::args::{FileOrStdin, Plumbing};
 use crate::config::Config;
-#[cfg(unix)]
+#[cfg(any(unix, feature = "onions"))]
 use crate::db::channel::DatabaseServer;
 use crate::db::header::CryptoHash;
 use crate::db::{AccessMode, Database, DatabaseClient};
@@ -325,7 +325,7 @@ pub async fn run(
             let db_socket_path = config.db_socket_path()?;
 
             tokio::select! {
-                _ = db_server.run() => bail!("Database server has terminated"),
+                Err(err) = db_server.run() => bail!("Database server has terminated: {err:#}"),
                 ret = p2p::db::spawn_unix_db_server(&db_client, db_socket_path) => ret,
             }?;
         }
@@ -469,7 +469,7 @@ pub async fn run(
             let (mut db_server, db_client) = DatabaseServer::new(db);
 
             tokio::select! {
-                _ = db_server.run() => bail!("Database server has terminated"),
+                Err(err) = db_server.run() => bail!("Database server has terminated: {err:#}"),
                 ret = p2p::onions::spawn(&db_client, path, onion.options) => ret,
             }?;
         }