Code reformatting.
This commit is contained in:
+9
-17
@@ -8,21 +8,21 @@ use derive_more::{Display, Error, From};
|
||||
use crate::dns::authority::Authority;
|
||||
use crate::dns::cache::SynchronizedCache;
|
||||
use crate::dns::client::{DnsClient, DnsNetworkClient};
|
||||
use crate::dns::resolve::{DnsResolver, ForwardingDnsResolver, RecursiveDnsResolver};
|
||||
use crate::dns::filter::DnsFilter;
|
||||
use crate::dns::resolve::{DnsResolver, ForwardingDnsResolver, RecursiveDnsResolver};
|
||||
|
||||
#[derive(Debug, Display, From, Error)]
|
||||
pub enum ContextError {
|
||||
Authority(crate::dns::authority::AuthorityError),
|
||||
Client(crate::dns::client::ClientError),
|
||||
Io(std::io::Error),
|
||||
Io(std::io::Error)
|
||||
}
|
||||
|
||||
type Result<T> = std::result::Result<T, ContextError>;
|
||||
|
||||
pub struct ServerStatistics {
|
||||
pub tcp_query_count: AtomicUsize,
|
||||
pub udp_query_count: AtomicUsize,
|
||||
pub udp_query_count: AtomicUsize
|
||||
}
|
||||
|
||||
impl ServerStatistics {
|
||||
@@ -37,7 +37,7 @@ impl ServerStatistics {
|
||||
|
||||
pub enum ResolveStrategy {
|
||||
Recursive,
|
||||
Forward { upstreams: Vec<String> },
|
||||
Forward { upstreams: Vec<String> }
|
||||
}
|
||||
|
||||
pub struct ServerContext {
|
||||
@@ -76,11 +76,8 @@ impl ServerContext {
|
||||
enable_udp: true,
|
||||
enable_tcp: true,
|
||||
enable_api: false,
|
||||
statistics: ServerStatistics {
|
||||
tcp_query_count: AtomicUsize::new(0),
|
||||
udp_query_count: AtomicUsize::new(0),
|
||||
},
|
||||
zones_dir: "zones",
|
||||
statistics: ServerStatistics { tcp_query_count: AtomicUsize::new(0), udp_query_count: AtomicUsize::new(0) },
|
||||
zones_dir: "zones"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,13 +107,11 @@ pub mod tests {
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::*;
|
||||
use crate::dns::authority::Authority;
|
||||
use crate::dns::cache::SynchronizedCache;
|
||||
|
||||
use crate::dns::client::tests::{DnsStubClient, StubCallback};
|
||||
|
||||
use super::*;
|
||||
|
||||
pub fn create_test_context(callback: Box<StubCallback>) -> Arc<ServerContext> {
|
||||
Arc::new(ServerContext {
|
||||
authority: Authority::new(),
|
||||
@@ -130,11 +125,8 @@ pub mod tests {
|
||||
enable_udp: true,
|
||||
enable_tcp: true,
|
||||
enable_api: false,
|
||||
statistics: ServerStatistics {
|
||||
tcp_query_count: AtomicUsize::new(0),
|
||||
udp_query_count: AtomicUsize::new(0),
|
||||
},
|
||||
zones_dir: "zones",
|
||||
statistics: ServerStatistics { tcp_query_count: AtomicUsize::new(0), udp_query_count: AtomicUsize::new(0) },
|
||||
zones_dir: "zones"
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user