fix: remove unused config parameter in mode functions
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
@@ -3,7 +3,7 @@ use axum::{
|
||||
Router,
|
||||
};
|
||||
use clap::Command;
|
||||
use log::{debug, info, warn};
|
||||
use log::{debug, info};
|
||||
use std::net::SocketAddr;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
@@ -22,23 +22,22 @@ pub use common::{ServerConfig, AppState, logging_middleware, create_auth_middlew
|
||||
pub fn mode_server(
|
||||
_cmd: &mut Command,
|
||||
settings: &config::Settings,
|
||||
config: &config::Settings,
|
||||
conn: &mut rusqlite::Connection,
|
||||
data_path: PathBuf,
|
||||
) -> Result<()> {
|
||||
// Get server address from args or config with default
|
||||
let server_address = if let Some(addr) = &settings.server_address {
|
||||
let server_address = if let Some(addr) = &settings.server_address() {
|
||||
addr.clone()
|
||||
} else if let Some(server_config) = &config.server {
|
||||
} else if let Some(server_config) = &settings.server {
|
||||
server_config.address.clone().unwrap_or_else(|| "127.0.0.1".to_string())
|
||||
} else {
|
||||
"127.0.0.1".to_string()
|
||||
};
|
||||
|
||||
// Get server port from args or config with default
|
||||
let server_port = if let Some(port) = settings.server_port {
|
||||
let server_port = if let Some(port) = settings.server_port() {
|
||||
port
|
||||
} else if let Some(server_config) = &config.server {
|
||||
} else if let Some(server_config) = &settings.server {
|
||||
server_config.port.unwrap_or(21080)
|
||||
} else {
|
||||
21080
|
||||
@@ -47,8 +46,8 @@ pub fn mode_server(
|
||||
let server_config = common::ServerConfig {
|
||||
address: server_address,
|
||||
port: Some(server_port),
|
||||
password: settings.server_password.clone(),
|
||||
password_hash: settings.server_password_hash.clone(),
|
||||
password: settings.server_password(),
|
||||
password_hash: settings.server_password_hash(),
|
||||
};
|
||||
|
||||
// We need to move the connection into the async runtime
|
||||
|
||||
Reference in New Issue
Block a user