Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix misleading instruction in error message (#8821)

This commit is contained in:
Jan 2019-04-26 11:40:01 +02:00 committed by GitHub
parent b18b8b05aa
commit 1b36a68742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
v3.4.6 (XXXX-XX-XX) v3.4.6 (XXXX-XX-XX)
------------------- -------------------
* fixed internal issue #3893: correct wrong option name `--database.ignore-logfile-errors`
in error message and correct it to `--database.ignore-datafile-errors`
* fixed internal issue #2946: create graph autocomplete was not working under * fixed internal issue #2946: create graph autocomplete was not working under
certain circumstances. certain circumstances.

2
arangod/RestServer/CheckVersionFeature.cpp
View File

@ -164,7 +164,7 @@ void CheckVersionFeature::checkVersion() {
LOG_TOPIC(WARN, Logger::STARTUP) LOG_TOPIC(WARN, Logger::STARTUP)
<< "in order to automatically fix the VERSION file on startup, " << "in order to automatically fix the VERSION file on startup, "
<< "please start the server with option " << "please start the server with option "
"`--database.ignore-logfile-errors true`"; "`--database.ignore-datafile-errors true`";
} }
} }

4
arangod/VocBase/Methods/Upgrade.cpp
View File

@ -110,14 +110,14 @@ UpgradeResult Upgrade::startup(TRI_vocbase_t& vocbase, bool isUpgrade, bool igno
// give it another try // give it another try
LOG_TOPIC(WARN, Logger::STARTUP) LOG_TOPIC(WARN, Logger::STARTUP)
<< "overwriting unparsable VERSION file with default value " << "overwriting unparsable VERSION file with default value "
<< "because option `--database.ignore-logfile-errors` is set"; << "because option `--database.ignore-datafile-errors` is set";
vinfo = methods::Version::check(&vocbase); vinfo = methods::Version::check(&vocbase);
} }
} else { } else {
LOG_TOPIC(WARN, Logger::STARTUP) LOG_TOPIC(WARN, Logger::STARTUP)
<< "in order to automatically fix the VERSION file on startup, " << "in order to automatically fix the VERSION file on startup, "
<< "please start the server with option " << "please start the server with option "
"`--database.ignore-logfile-errors true`"; "`--database.ignore-datafile-errors true`";
} }
} }