Feature/minor cleanup (#14661)

goedderz · web-flow · commit f31afe136441 · 2021-08-26T11:25:24.000+02:00
diff --git a/arangod/RestHandler/RestShutdownHandler.cpp b/arangod/RestHandler/RestShutdownHandler.cpp
@@ -98,7 +98,7 @@ RestStatus RestShutdownHandler::execute() {
     builder.add(VPackValue(true));
     AgencyCommResult result = agency.setValue("Shutdown", builder.slice(), 0.0);
     if (!result.successful()) {
-      generateError(rest::ResponseCode::SERVER_ERROR, TRI_ERROR_HTTP_SERVER_ERROR);
+      generateError(result.asResult());
       return RestStatus::DONE;
     }
     removeFromCluster = true;
diff --git a/arangosh/Utils/ClientManager.cpp b/arangosh/Utils/ClientManager.cpp
@@ -25,6 +25,7 @@
 #include "ClientManager.h"
 
 #include "ApplicationFeatures/ApplicationServer.h"
+#include "Basics/StaticStrings.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/application-exit.h"
 #include "Logger/Logger.h"
@@ -56,9 +57,11 @@ arangodb::Result getHttpErrorMessage(arangodb::httpclient::SimpleHttpResult* res
     std::shared_ptr<VPackBuilder> parsedBody = result->getBodyVelocyPack();
     VPackSlice const body = parsedBody->slice();
 
-    auto serverCode = VelocyPackHelper::getNumericValue<int>(body, "errorNum", 0);
-    std::string const& serverMessage =
-        VelocyPackHelper::getStringValue(body, "errorMessage", "");
+    auto serverCode =
+        VelocyPackHelper::getNumericValue<int>(body, arangodb::StaticStrings::ErrorNum, 0);
+    auto serverMessage =
+        VelocyPackHelper::getStringValue(body, arangodb::StaticStrings::ErrorMessage,
+                                         "");
 
     if (serverCode > 0) {
       code = ErrorCode{serverCode};

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ RestStatus RestShutdownHandler::execute() {`
`98`	`98`	`builder.add(VPackValue(true));`
`99`	`99`	`AgencyCommResult result = agency.setValue("Shutdown", builder.slice(), 0.0);`
`100`	`100`	`if (!result.successful()) {`
`101`		`- generateError(rest::ResponseCode::SERVER_ERROR, TRI_ERROR_HTTP_SERVER_ERROR);`
	`101`	`+ generateError(result.asResult());`
`102`	`102`	`return RestStatus::DONE;`
`103`	`103`	`}`
`104`	`104`	`removeFromCluster = true;`