From 418d9f7ca19c17f0d81b5563f72e57a1ca814ba0 Mon Sep 17 00:00:00 2001 From: Kevin Guthrie Date: Mon, 21 Oct 2024 11:14:20 -0400 Subject: Change `new_with_opt_and_conf` to accept `impl Into>` instead of explicit option --- .bleep | 2 +- pingora-core/src/server/mod.rs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bleep b/.bleep index 6aa8cd3..6094ec7 100644 --- a/.bleep +++ b/.bleep @@ -1 +1 @@ -986270b9e07bce082ff02c86ca183b8c81d7abb8 \ No newline at end of file +5575f7e332f3f097132e2281ce0e09cb0c11edfa \ No newline at end of file diff --git a/pingora-core/src/server/mod.rs b/pingora-core/src/server/mod.rs index 3622354..c056ed2 100644 --- a/pingora-core/src/server/mod.rs +++ b/pingora-core/src/server/mod.rs @@ -194,12 +194,13 @@ impl Server { /// /// If a configuration file path is provided as part of `opt`, it will be ignored /// and a warning will be logged. - pub fn new_with_opt_and_conf(opt: Option, mut conf: ServerConf) -> Server { - if let Some(opt) = &opt { - if let Some(c) = opt.conf.as_ref() { + pub fn new_with_opt_and_conf(raw_opt: impl Into>, mut conf: ServerConf) -> Server { + let opt = raw_opt.into(); + if let Some(opts) = &opt { + if let Some(c) = opts.conf.as_ref() { warn!("Ignoring command line argument using '{c}' as configuration, and using provided configuration instead."); } - conf.merge_with_opt(&opt); + conf.merge_with_opt(opts); } let (tx, rx) = watch::channel(false); -- cgit v1.2.3