jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-31 18:17:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'show-dns-setup-error' into 'next'

Browse Source 
Display actual error message from TokioAsyncResolver, if any

See merge request famedly/conduit!296
This commit is contained in:
Timo Kösters 2022-02-12 13:01:41 +00:00
commit 0565b5a6c8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/globals.rs
View File

@ -149,7 +149,11 @@ impl Globals {
globals, globals,
config, config,
keypair: Arc::new(keypair), keypair: Arc::new(keypair),
dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|_| { dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|e| {
error!(
"Failed to set up trust dns resolver with system config: {}",
e
);
Error::bad_config("Failed to set up trust dns resolver with system config.") Error::bad_config("Failed to set up trust dns resolver with system config.")
})?, })?,
actual_destination_cache: Arc::new(RwLock::new(WellKnownMap::new())), actual_destination_cache: Arc::new(RwLock::new(WellKnownMap::new())),