diff --git a/nix/module.nix b/nix/module.nix index 5117346..9b13c6c 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -16,16 +16,14 @@ in }; logLevel = lib.mkOption { - type = lib.types.enum [ "quiet" "error" "warn" "info" "debug" "trace" ]; + type = lib.types.enum [ "quiet" "info" "debug" "trace" ]; default = "info"; description = "Log level for muscl"; apply = level: { "quiet" = "-q"; - "error" = ""; - "warn" = "-v"; - "info" = "-vv"; - "debug" = "-vvv"; - "trace" = "-vvvv"; + "info" = ""; + "debug" = "-v"; + "trace" = "-vv"; }.${level}; }; diff --git a/src/core/bootstrap.rs b/src/core/bootstrap.rs index 3615d18..6ebe84c 100644 --- a/src/core/bootstrap.rs +++ b/src/core/bootstrap.rs @@ -1,7 +1,7 @@ use std::{fs, path::PathBuf, sync::Arc, time::Duration}; use anyhow::{Context, anyhow}; -use clap_verbosity_flag::Verbosity; +use clap_verbosity_flag::{InfoLevel, Verbosity}; use nix::libc::{EXIT_SUCCESS, exit}; use sqlx::mysql::MySqlPoolOptions; use std::os::unix::net::UnixStream as StdUnixStream; @@ -77,7 +77,7 @@ fn will_connect_to_external_server( pub fn bootstrap_server_connection_and_drop_privileges( server_socket_path: Option, config: Option, - verbose: Verbosity, + verbose: Verbosity, ) -> anyhow::Result { if will_connect_to_external_server(server_socket_path.as_ref(), config.as_ref())? { assert!( diff --git a/src/main.rs b/src/main.rs index 479879f..7a1eb23 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ extern crate prettytable; use anyhow::Context; use clap::{CommandFactory, Parser, ValueEnum}; use clap_complete::{CompleteEnv, Shell, generate}; -use clap_verbosity_flag::Verbosity; +use clap_verbosity_flag::{InfoLevel, Verbosity}; use std::path::PathBuf; @@ -73,7 +73,7 @@ struct Args { config: Option, #[command(flatten)] - verbose: Verbosity, + verbose: Verbosity } #[derive(Parser, Debug, Clone)] @@ -252,7 +252,7 @@ const MIN_TOKIO_WORKER_THREADS: usize = 4; /// Start a long-lived server using Tokio. fn tokio_start_server( config_path: Option, - verbosity: Verbosity, + verbosity: Verbosity, args: ServerArgs, ) -> anyhow::Result<()> { let worker_thread_count = std::cmp::max(num_cpus::get(), MIN_TOKIO_WORKER_THREADS); diff --git a/src/server/command.rs b/src/server/command.rs index 5cc1cea..6f1d07f 100644 --- a/src/server/command.rs +++ b/src/server/command.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use anyhow::Context; use clap::Parser; -use clap_verbosity_flag::Verbosity; +use clap_verbosity_flag::{InfoLevel, Verbosity}; use tracing_subscriber::prelude::*; use crate::{ @@ -56,7 +56,7 @@ pub fn trace_server_prelude() { pub async fn handle_command( config_path: Option, - verbosity: Verbosity, + verbosity: Verbosity, args: ServerArgs, ) -> anyhow::Result<()> { let mut auto_detected_systemd_mode = false;