aquatic_udp: use log crate instead of eprintln, add LogLevel to Config

This commit is contained in:
Joakim Frostegård 2020-08-13 04:52:50 +02:00
parent dd19f32a2a
commit f4187f4368
6 changed files with 19 additions and 9 deletions

View file

@ -2,6 +2,8 @@ use std::net::SocketAddr;
use serde::{Serialize, Deserialize};
use aquatic_cli_helpers::LogLevel;
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)]
@ -13,6 +15,7 @@ pub struct Config {
/// Request workers receive a number of requests from socket workers,
/// generate responses and send them back to the socket workers.
pub request_workers: usize,
pub log_level: LogLevel,
pub network: NetworkConfig,
pub protocol: ProtocolConfig,
pub handlers: HandlerConfig,
@ -22,7 +25,11 @@ pub struct Config {
}
impl aquatic_cli_helpers::Config for Config {}
impl aquatic_cli_helpers::Config for Config {
fn get_log_level(&self) -> Option<LogLevel> {
Some(self.log_level)
}
}
#[derive(Clone, Debug, Serialize, Deserialize)]
@ -108,6 +115,7 @@ impl Default for Config {
Self {
socket_workers: 1,
request_workers: 1,
log_level: LogLevel::Error,
network: NetworkConfig::default(),
protocol: ProtocolConfig::default(),
handlers: HandlerConfig::default(),