fix issue with toml configuration missing url value

DefGuard · Nov 21, 2024 · 96ac29c · 96ac29c
1 parent 00c6b41
commit 96ac29c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "defguard-proxy"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://github.com/DefGuard/proxy"

diff --git a/example-config.toml b/example-config.toml
@@ -16,3 +16,4 @@ grpc_port = 50051
 log_level = "info"
 rate_limit_per_second = 0
 rate_limit_burst = 0
+url = "http://localhost:8080"
diff --git a/src/config.rs b/src/config.rs
@@ -5,6 +5,10 @@ use log::LevelFilter;
 use serde::Deserialize;
 use url::Url;
 
+fn default_url() -> Url {
+    Url::parse("http://localhost:8080").unwrap()
+}
+
 #[derive(Parser, Debug, Deserialize)]
 #[command(version)]
 pub struct Config {
@@ -42,6 +46,7 @@ pub struct Config {
         value_parser = Url::parse,
         default_value = "http://localhost:8080"
     )]
+    #[serde(default = "default_url")]
     pub url: Url,
 
     /// Configuration file path