searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

better exit on error

Browse source 
Update meilisearch-core/src/database.rs

Co-authored-by: Clément Renault <renault.cle@gmail.com>

Update meilisearch-core/src/database.rs

Co-authored-by: Clément Renault <renault.cle@gmail.com>
This commit is contained in:
mpostma 2020-06-24 16:06:04 +02:00
parent 6f0b6933e6
commit 51d7c84e73
5 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meilisearch-core/src/database.rs
View file

@ -180,15 +180,15 @@ fn version_guard(path: &Path, create: bool) -> MResult<()> {
let version_minor = version.next().ok_or(Error::VersionMismatch("bad VERSION file".to_string()))?;
if version_major != current_version_major || version_minor != current_version_minor {
return Err(Error::VersionMismatch(format!("{}.{}.XX", version_major, version_major)));
return Err(Error::VersionMismatch(format!("{}.{}.XX", version_major, version_minor)));
}
}
Err(error) => {
match error.kind() {
ErrorKind::NotFound => {
if create {
// when no version file is found, and we've beem told to create one,
// create a new file wioth the current version in it.
// when no version file is found, and we've been told to create one,
// create a new file with the current version in it.
let mut version_file = File::create(&version_path)?;
version_file.write_all(format!("{}.{}.{}",
current_version_major,
@ -196,7 +196,7 @@ fn version_guard(path: &Path, create: bool) -> MResult<()> {
current_version_patch).as_bytes())?;
} else {
// when no version file is found and we were not told to create one, this
// means that the version is inferior to the one this feature was added.
// means that the version is inferior to the one this feature was added in.
return Err(Error::VersionMismatch(format!("<0.12.0")));
}
}

6
meilisearch-core/src/error.rs
View file

@ -158,7 +158,11 @@ impl fmt::Display for Error {
SchemaMissing => write!(f, "this index does not have a schema"),
SerdeJson(e) => write!(f, "serde json error; {}", e),
Serializer(e) => write!(f, "serializer error; {}", e),
VersionMismatch(version) => write!(f, "Cannot open database, expected Meilisearch version: {}", version),
VersionMismatch(version) => write!(f, "Cannot open database, expected MeiliSearch engine version: {}, currrent engine version: {}.{}.{}",
version,
env!("CARGO_PKG_VERSION_MAJOR"),
env!("CARGO_PKG_VERSION_MINOR"),
env!("CARGO_PKG_VERSION_PATCH")),
WordIndexMissing => write!(f, "this index does not have a word index"),
}
}