Improve error messages

Andreas Streichardt · Andreas Streichardt · commit 60bca789f84b · 2016-11-21T17:47:05.000+01:00
diff --git a/arangod/Replication/InitialSyncer.h b/arangod/Replication/InitialSyncer.h
@@ -105,6 +105,8 @@ class InitialSyncer : public Syncer {
     return _processedCollections;
   }
 
+  std::string progress() { return _progress; }
+
  private:
   //////////////////////////////////////////////////////////////////////////////
   /// @brief set a progress message
diff --git a/arangod/V8Server/v8-replication.cpp b/arangod/V8Server/v8-replication.cpp
@@ -376,10 +376,10 @@ static void JS_SynchronizeReplication(
 
   if (res != TRI_ERROR_NO_ERROR) {
     if (errorMsg.empty()) {
-      TRI_V8_THROW_EXCEPTION_MESSAGE(res, "cannot sync from remote endpoint");
+      TRI_V8_THROW_EXCEPTION_MESSAGE(res, "cannot sync from remote endpoint. last progress message was '" + syncer.progress() + "'");
     } else {
       TRI_V8_THROW_EXCEPTION_MESSAGE(
-          res, "cannot sync from remote endpoint: " + errorMsg);
+          res, "cannot sync from remote endpoint: " + errorMsg + ". last progress message was '" + syncer.progress() + "'");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ class InitialSyncer : public Syncer {`
`105`	`105`	`return _processedCollections;`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ std::string progress() { return _progress; }`
	`109`	`+`
`108`	`110`	`private:`
`109`	`111`	`//////////////////////////////////////////////////////////////////////////////`
`110`	`112`	`/// @brief set a progress message`
Original file line number	Diff line number	Diff line change
`@@ -376,10 +376,10 @@ static void JS_SynchronizeReplication(`
`376`	`376`
`377`	`377`	`if (res != TRI_ERROR_NO_ERROR) {`
`378`	`378`	`if (errorMsg.empty()) {`
`379`		`- TRI_V8_THROW_EXCEPTION_MESSAGE(res, "cannot sync from remote endpoint");`
	`379`	`+ TRI_V8_THROW_EXCEPTION_MESSAGE(res, "cannot sync from remote endpoint. last progress message was '" + syncer.progress() + "'");`
`380`	`380`	`} else {`
`381`	`381`	`TRI_V8_THROW_EXCEPTION_MESSAGE(`
`382`		`- res, "cannot sync from remote endpoint: " + errorMsg);`
	`382`	`+ res, "cannot sync from remote endpoint: " + errorMsg + ". last progress message was '" + syncer.progress() + "'");`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`