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

slightly updated error messages

This commit is contained in:
Jan Steemann 2014-01-18 01:22:26 +01:00
parent 583878176b
commit 5c5b787e83
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangosh/V8Client/arangoimp.cpp
View File

@ -304,7 +304,8 @@ int main (int argc, char* argv[]) {
BaseClient.sslProtocol(), BaseClient.sslProtocol(),
false); false);
if (! ClientConnection->isConnected() || ClientConnection->getLastHttpReturnCode() != HttpResponse::OK) { if (! ClientConnection->isConnected() ||
ClientConnection->getLastHttpReturnCode() != HttpResponse::OK) {
cerr << "Could not connect to endpoint '" << BaseClient.endpointServer()->getSpecification() cerr << "Could not connect to endpoint '" << BaseClient.endpointServer()->getSpecification()
<< "', database: '" << BaseClient.databaseName() << "'" << endl; << "', database: '" << BaseClient.databaseName() << "'" << endl;
cerr << "Error message: '" << ClientConnection->getErrorMessage() << "'" << endl; cerr << "Error message: '" << ClientConnection->getErrorMessage() << "'" << endl;
@ -359,18 +360,18 @@ int main (int argc, char* argv[]) {
// collection name // collection name
if (CollectionName == "") { if (CollectionName == "") {
cerr << "collection name is missing." << endl; cerr << "Collection name is missing." << endl;
TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL); TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL);
} }
// filename // filename
if (FileName == "") { if (FileName == "") {
cerr << "file name is missing." << endl; cerr << "File name is missing." << endl;
TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL); TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL);
} }
if (FileName != "-" && ! FileUtils::isRegularFile(FileName)) { if (FileName != "-" && ! FileUtils::isRegularFile(FileName)) {
cerr << "file '" << FileName << "' is not a regular file." << endl; cerr << "Cannot open file '" << FileName << "'" << endl;
TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL); TRI_EXIT_FUNCTION(EXIT_FAILURE, NULL);
} }
@ -416,9 +417,6 @@ int main (int argc, char* argv[]) {
cerr << "error message: " << ih.getErrorMessage() << endl; cerr << "error message: " << ih.getErrorMessage() << endl;
} }
// calling dispose in V8 3.10.x causes a segfault. the v8 docs says its not necessary to call it upon program termination
// v8::V8::Dispose();
TRIAGENS_REST_SHUTDOWN; TRIAGENS_REST_SHUTDOWN;
arangoimpExitFunction(ret, NULL); arangoimpExitFunction(ret, NULL);