mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-26 12:05:05 +08:00
Rename dumps-dir
to dump-dir
in CLI
Also rename the associated environment variable
This commit is contained in:
parent
93b59d55e3
commit
e35db5e59b
@ -121,7 +121,7 @@ pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc<IndexScheduler>, Auth
|
|||||||
update_file_path: opt.db_path.join("update_files"),
|
update_file_path: opt.db_path.join("update_files"),
|
||||||
indexes_path: opt.db_path.join("indexes"),
|
indexes_path: opt.db_path.join("indexes"),
|
||||||
snapshots_path: opt.snapshot_dir.clone(),
|
snapshots_path: opt.snapshot_dir.clone(),
|
||||||
dumps_path: opt.dumps_dir.clone(),
|
dumps_path: opt.dump_dir.clone(),
|
||||||
task_db_size: opt.max_task_db_size.get_bytes() as usize,
|
task_db_size: opt.max_task_db_size.get_bytes() as usize,
|
||||||
index_size: opt.max_index_size.get_bytes() as usize,
|
index_size: opt.max_index_size.get_bytes() as usize,
|
||||||
indexer_config: (&opt.indexer_options).try_into()?,
|
indexer_config: (&opt.indexer_options).try_into()?,
|
||||||
|
@ -47,7 +47,7 @@ const MEILI_SNAPSHOT_INTERVAL_SEC: &str = "MEILI_SNAPSHOT_INTERVAL_SEC";
|
|||||||
const MEILI_IMPORT_DUMP: &str = "MEILI_IMPORT_DUMP";
|
const MEILI_IMPORT_DUMP: &str = "MEILI_IMPORT_DUMP";
|
||||||
const MEILI_IGNORE_MISSING_DUMP: &str = "MEILI_IGNORE_MISSING_DUMP";
|
const MEILI_IGNORE_MISSING_DUMP: &str = "MEILI_IGNORE_MISSING_DUMP";
|
||||||
const MEILI_IGNORE_DUMP_IF_DB_EXISTS: &str = "MEILI_IGNORE_DUMP_IF_DB_EXISTS";
|
const MEILI_IGNORE_DUMP_IF_DB_EXISTS: &str = "MEILI_IGNORE_DUMP_IF_DB_EXISTS";
|
||||||
const MEILI_DUMPS_DIR: &str = "MEILI_DUMPS_DIR";
|
const MEILI_DUMP_DIR: &str = "MEILI_DUMP_DIR";
|
||||||
const MEILI_LOG_LEVEL: &str = "MEILI_LOG_LEVEL";
|
const MEILI_LOG_LEVEL: &str = "MEILI_LOG_LEVEL";
|
||||||
#[cfg(feature = "metrics")]
|
#[cfg(feature = "metrics")]
|
||||||
const MEILI_ENABLE_METRICS_ROUTE: &str = "MEILI_ENABLE_METRICS_ROUTE";
|
const MEILI_ENABLE_METRICS_ROUTE: &str = "MEILI_ENABLE_METRICS_ROUTE";
|
||||||
@ -61,7 +61,7 @@ const DEFAULT_MAX_TASK_DB_SIZE: &str = "100 GiB";
|
|||||||
const DEFAULT_HTTP_PAYLOAD_SIZE_LIMIT: &str = "100 MB";
|
const DEFAULT_HTTP_PAYLOAD_SIZE_LIMIT: &str = "100 MB";
|
||||||
const DEFAULT_SNAPSHOT_DIR: &str = "snapshots/";
|
const DEFAULT_SNAPSHOT_DIR: &str = "snapshots/";
|
||||||
const DEFAULT_SNAPSHOT_INTERVAL_SEC: u64 = 86400;
|
const DEFAULT_SNAPSHOT_INTERVAL_SEC: u64 = 86400;
|
||||||
const DEFAULT_DUMPS_DIR: &str = "dumps/";
|
const DEFAULT_DUMP_DIR: &str = "dumps/";
|
||||||
const DEFAULT_LOG_LEVEL: &str = "INFO";
|
const DEFAULT_LOG_LEVEL: &str = "INFO";
|
||||||
|
|
||||||
const MEILI_MAX_INDEXING_MEMORY: &str = "MEILI_MAX_INDEXING_MEMORY";
|
const MEILI_MAX_INDEXING_MEMORY: &str = "MEILI_MAX_INDEXING_MEMORY";
|
||||||
@ -219,9 +219,9 @@ pub struct Opt {
|
|||||||
pub ignore_dump_if_db_exists: bool,
|
pub ignore_dump_if_db_exists: bool,
|
||||||
|
|
||||||
/// Sets the directory where Meilisearch will create dump files.
|
/// Sets the directory where Meilisearch will create dump files.
|
||||||
#[clap(long, env = MEILI_DUMPS_DIR, default_value_os_t = default_dumps_dir())]
|
#[clap(long, env = MEILI_DUMP_DIR, default_value_os_t = default_dump_dir())]
|
||||||
#[serde(default = "default_dumps_dir")]
|
#[serde(default = "default_dump_dir")]
|
||||||
pub dumps_dir: PathBuf,
|
pub dump_dir: PathBuf,
|
||||||
|
|
||||||
/// Defines how much detail should be present in Meilisearch's logs.
|
/// Defines how much detail should be present in Meilisearch's logs.
|
||||||
///
|
///
|
||||||
@ -320,7 +320,7 @@ impl Opt {
|
|||||||
snapshot_dir,
|
snapshot_dir,
|
||||||
schedule_snapshot,
|
schedule_snapshot,
|
||||||
snapshot_interval_sec,
|
snapshot_interval_sec,
|
||||||
dumps_dir,
|
dump_dir,
|
||||||
log_level,
|
log_level,
|
||||||
indexer_options,
|
indexer_options,
|
||||||
scheduler_options,
|
scheduler_options,
|
||||||
@ -373,7 +373,7 @@ impl Opt {
|
|||||||
MEILI_SNAPSHOT_INTERVAL_SEC,
|
MEILI_SNAPSHOT_INTERVAL_SEC,
|
||||||
snapshot_interval_sec.to_string(),
|
snapshot_interval_sec.to_string(),
|
||||||
);
|
);
|
||||||
export_to_env_if_not_present(MEILI_DUMPS_DIR, dumps_dir);
|
export_to_env_if_not_present(MEILI_DUMP_DIR, dump_dir);
|
||||||
export_to_env_if_not_present(MEILI_LOG_LEVEL, log_level);
|
export_to_env_if_not_present(MEILI_LOG_LEVEL, log_level);
|
||||||
#[cfg(feature = "metrics")]
|
#[cfg(feature = "metrics")]
|
||||||
{
|
{
|
||||||
@ -708,8 +708,8 @@ fn default_snapshot_interval_sec() -> u64 {
|
|||||||
DEFAULT_SNAPSHOT_INTERVAL_SEC
|
DEFAULT_SNAPSHOT_INTERVAL_SEC
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_dumps_dir() -> PathBuf {
|
fn default_dump_dir() -> PathBuf {
|
||||||
PathBuf::from(DEFAULT_DUMPS_DIR)
|
PathBuf::from(DEFAULT_DUMP_DIR)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_log_level() -> String {
|
fn default_log_level() -> String {
|
||||||
|
@ -184,7 +184,7 @@ impl Server {
|
|||||||
pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
|
pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
|
||||||
Opt {
|
Opt {
|
||||||
db_path: dir.as_ref().join("db"),
|
db_path: dir.as_ref().join("db"),
|
||||||
dumps_dir: dir.as_ref().join("dump"),
|
dump_dir: dir.as_ref().join("dump"),
|
||||||
env: "development".to_owned(),
|
env: "development".to_owned(),
|
||||||
#[cfg(all(not(debug_assertions), feature = "analytics"))]
|
#[cfg(all(not(debug_assertions), feature = "analytics"))]
|
||||||
no_analytics: true,
|
no_analytics: true,
|
||||||
|
Loading…
Reference in New Issue
Block a user