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

fixed issue #4045: fix misleading error message in arangorestore (#4049)

This commit is contained in:
Jan 2017-12-16 15:18:35 +01:00 committed by GitHub
parent 5878d8184e
commit a3d169eb5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arangosh/Dump/DumpFeature.cpp
View File

@ -539,9 +539,14 @@ int DumpFeature::runDump(std::string& dbName, std::string& errorMsg) {
endEncryption(fd); endEncryption(fd);
TRI_TRACKED_CLOSE_FILE(fd); TRI_TRACKED_CLOSE_FILE(fd);
} catch (basics::Exception const& ex) {
errorMsg = ex.what();
return ex.code();
} catch (std::exception const& ex) {
errorMsg = ex.what();
return TRI_ERROR_INTERNAL;
} catch (...) { } catch (...) {
errorMsg = "out of memory"; errorMsg = "out of memory";
return TRI_ERROR_OUT_OF_MEMORY; return TRI_ERROR_OUT_OF_MEMORY;
} }

6
arangosh/Restore/RestoreFeature.cpp
View File

@ -394,6 +394,12 @@ int RestoreFeature::processInputDirectory(std::string& errorMsg) {
} else { } else {
encryptionType = "none"; encryptionType = "none";
} }
} catch (basics::Exception const& ex) {
errorMsg = ex.what();
return ex.code();
} catch (std::exception const& ex) {
errorMsg = ex.what();
return TRI_ERROR_INTERNAL;
} catch (...) { } catch (...) {
// file not found etc. // file not found etc.
} }

3
arangosh/Shell/ShellFeature.cpp
View File

@ -161,9 +161,6 @@ void ShellFeature::start() {
ok = shell->jslint(_jslint); ok = shell->jslint(_jslint);
break; break;
} }
} catch (basics::Exception const& ex) {
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught exception " << ex.what();
ok = false;
} catch (std::exception const& ex) { } catch (std::exception const& ex) {
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught exception " << ex.what(); LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught exception " << ex.what();
ok = false; ok = false;

12
lib/Basics/FileUtils.cpp
View File

@ -396,7 +396,11 @@ std::vector<std::string> listFiles(std::string const& directory) {
handle = _findfirst(filter.c_str(), &fd); handle = _findfirst(filter.c_str(), &fd);
if (handle == -1) { if (handle == -1) {
return result; TRI_set_errno(TRI_ERROR_SYS_ERROR);
int res = TRI_errno();
std::string message("failed to enumerate files in directory '" + directory + "': " + strerror(res));
THROW_ARANGO_EXCEPTION_MESSAGE(res, message);
} }
do { do {
@ -412,7 +416,11 @@ std::vector<std::string> listFiles(std::string const& directory) {
DIR* d = opendir(directory.c_str()); DIR* d = opendir(directory.c_str());
if (d == nullptr) { if (d == nullptr) {
return result; TRI_set_errno(TRI_ERROR_SYS_ERROR);
int res = TRI_errno();
std::string message("failed to enumerate files in directory '" + directory + "': " + strerror(res));
THROW_ARANGO_EXCEPTION_MESSAGE(res, message);
} }
dirent* de = readdir(d); dirent* de = readdir(d);