diff --git a/src/cli.rs b/src/cli.rs index 78daf6a8c9..c00846aa45 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -30,7 +30,7 @@ use crate::Config; pub use self::{ generate_config_schema::GenerateConfigSchema, manage::{Manage, Providers}, - run::Run + run::Run, }; const VERSION: &str = env!("CARGO_PKG_VERSION"); @@ -41,18 +41,13 @@ const ETC_CONFIG_PATH: &str = "/etc/quilkin/quilkin.yaml"; #[non_exhaustive] pub struct Cli { /// The path to the configuration file for the Quilkin instance. - #[clap( - short, - long, - env = "QUILKIN_CONFIG", - default_value = "quilkin.yaml", - )] + #[clap(short, long, env = "QUILKIN_CONFIG", default_value = "quilkin.yaml")] pub config: PathBuf, /// The port to bind for the admin server - #[clap(long, env="QUILKIN_ADMIN_ADDRESS")] + #[clap(long, env = "QUILKIN_ADMIN_ADDRESS")] pub admin_address: Option, /// Whether to spawn the admin server or not. - #[clap(long, env="QUILKIN_NO_ADMIN")] + #[clap(long, env = "QUILKIN_NO_ADMIN")] pub no_admin: bool, /// Whether Quilkin will report any results to stdout/stderr. #[clap(short, long, env)] diff --git a/src/cli/manage.rs b/src/cli/manage.rs index 3f9befce64..b396f2536b 100644 --- a/src/cli/manage.rs +++ b/src/cli/manage.rs @@ -30,18 +30,10 @@ pub enum Providers { /// and for a `ConfigMap` that specifies the filter configuration. Agones { /// The namespace under which the configmap is stored. - #[clap( - short, - long, - default_value = "default", - )] + #[clap(short, long, default_value = "default")] config_namespace: String, /// The namespace under which the game servers run. - #[clap( - short, - long, - default_value = "default", - )] + #[clap(short, long, default_value = "default")] gameservers_namespace: String, }, diff --git a/src/cli/run.rs b/src/cli/run.rs index ad784ca9a5..0c24395e10 100644 --- a/src/cli/run.rs +++ b/src/cli/run.rs @@ -27,12 +27,7 @@ pub struct Run { #[clap(short, long, env = "QUILKIN_PORT")] pub port: Option, /// One or more socket addresses to forward packets to. - #[clap( - short, - long, - env = "QUILKIN_DEST", - required(true), - )] + #[clap(short, long, env = "QUILKIN_DEST", required(true))] pub to: Vec, /// One or more `quilkin manage` endpoints to listen to for config changes #[clap( @@ -40,7 +35,7 @@ pub struct Run { long, env = "QUILKIN_MANAGEMENT_SERVER", required(true), - conflicts_with("to"), + conflicts_with("to") )] pub management_server: Vec, } diff --git a/src/lib.rs b/src/lib.rs index 2308c53726..939efc2705 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,9 +18,9 @@ mod admin; mod cluster; -mod proxy; pub(crate) mod metrics; pub(crate) mod prost; +mod proxy; pub(crate) mod ttl_map; pub(crate) mod utils;